aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/CollectionSubView.tsx
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2019-05-02 13:20:27 -0400
committerbob <bcz@cs.brown.edu>2019-05-02 13:20:27 -0400
commit1ece3904b6b3fbf4ddde29e93e31a30f3898e720 (patch)
treef22744b69ada30c0bc72e2942fc93412a5157b0f /src/client/views/collections/CollectionSubView.tsx
parent5f8f133040918713ace577cfe82f38254ea07964 (diff)
cleaned up drag code - userDropAction takes precedence over dropAction. default is alias
Diffstat (limited to 'src/client/views/collections/CollectionSubView.tsx')
-rw-r--r--src/client/views/collections/CollectionSubView.tsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx
index bcbde24f0..a59bc196e 100644
--- a/src/client/views/collections/CollectionSubView.tsx
+++ b/src/client/views/collections/CollectionSubView.tsx
@@ -83,13 +83,13 @@ export function CollectionSubView<T>(schemaCtor: (doc: Doc) => T) {
@action
protected drop(e: Event, de: DragManager.DropEvent): boolean {
if (de.data instanceof DragManager.DocumentDragData) {
- if (de.data.aliasOnDrop || de.data.copyOnDrop) {
+ if (de.data.dropAction || de.data.userDropAction) {
["width", "height", "curPage"].map(key =>
de.data.draggedDocuments.map((draggedDocument: Doc, i: number) =>
PromiseValue(Cast(draggedDocument[key], "number")).then(f => f && (de.data.droppedDocuments[i][key] = f))));
}
let added = false;
- if (de.data.aliasOnDrop || de.data.copyOnDrop) {
+ if (de.data.dropAction || de.data.userDropAction) {
added = de.data.droppedDocuments.reduce((added: boolean, d) => {
let moved = this.props.addDocument(d);
return moved || added;
@@ -129,7 +129,7 @@ export function CollectionSubView<T>(schemaCtor: (doc: Doc) => T) {
}
if (type.indexOf("excel") !== -1) {
ctor = Docs.DBDocument;
- options.copyDraggedItems = true;
+ options.dropAction = "copy";
}
if (type.indexOf("html") !== -1) {
if (path.includes('localhost')) {