diff options
author | hwc487 | 2012-03-21 15:26:24 -0700 |
---|---|---|
committer | hwc487 | 2012-03-21 15:26:24 -0700 |
commit | 3f6c49bff64a9a765c16d2bd21994f57b557a94b (patch) | |
tree | 3a658595917a82aa67b9fc0de2916d5d7502feab /js/mediators/drag-drop-mediator.js | |
parent | eb59a523258cad3351cba9bf8de986e90a8e5b1c (diff) | |
parent | 57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff) | |
download | ninja-3f6c49bff64a9a765c16d2bd21994f57b557a94b.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'js/mediators/drag-drop-mediator.js')
-rwxr-xr-x | js/mediators/drag-drop-mediator.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js index 3a965be5..8663b06e 100755 --- a/js/mediators/drag-drop-mediator.js +++ b/js/mediators/drag-drop-mediator.js | |||
@@ -60,6 +60,17 @@ exports.DragDropMediator = Montage.create(Component, { | |||
60 | var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY}, | 60 | var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY}, |
61 | rootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])), | 61 | rootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])), |
62 | rootUri = this.application.ninja.documentController.documentHackReference.root; | 62 | rootUri = this.application.ninja.documentController.documentHackReference.root; |
63 | |||
64 | var xferString = e.dataTransfer.getData("text/plain"); | ||
65 | if(xferString) { | ||
66 | // If the drop is a component, call the delegate with the top,left coordinates | ||
67 | if(xferString.indexOf("componentDrop") > -1) { | ||
68 | if(this.dropDelegate && typeof this.dropDelegate === 'object') { | ||
69 | this.dropDelegate.handleComponentDrop(e.offsetX - this.application.ninja.stage.userContentLeft, e.offsetY - this.application.ninja.stage.userContentTop); | ||
70 | return; | ||
71 | } | ||
72 | } | ||
73 | } | ||
63 | // | 74 | // |
64 | for (i=0; files[i]; i++) { | 75 | for (i=0; files[i]; i++) { |
65 | if (files[i].type.indexOf('image') !== -1) { | 76 | if (files[i].type.indexOf('image') !== -1) { |