aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/drag-drop-mediator.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-11 10:12:08 -0700
committerJonathan Duran2012-06-11 10:12:08 -0700
commit6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch)
tree377cd68e0580172bc234059dbd4482c964d49bd4 /js/mediators/drag-drop-mediator.js
parent79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff)
parentbad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff)
downloadninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/mediators/drag-drop-mediator.js')
-rwxr-xr-xjs/mediators/drag-drop-mediator.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 59086ef6..14bdb0eb 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -115,12 +115,10 @@ exports.DragDropMediator = Montage.create(Component, {
115 // 115 //
116 if (e.currentTarget.fileType.indexOf('svg') !== -1) { 116 if (e.currentTarget.fileType.indexOf('svg') !== -1) {
117 element = NJUtils.make('embed', null, this.application.ninja.currentDocument);//TODO: Verify this is proper 117 element = NJUtils.make('embed', null, this.application.ninja.currentDocument);//TODO: Verify this is proper
118 NJUtils.createModelWithSelection(element, "SVG");
119 element.type = 'image/svg+xml'; 118 element.type = 'image/svg+xml';
120 element.src = url+'/'+fileName; 119 element.src = url+'/'+fileName;
121 } else { 120 } else {
122 element = NJUtils.make('image', null, this.application.ninja.currentDocument); 121 element = NJUtils.make('image', null, this.application.ninja.currentDocument);
123 NJUtils.createModel(element);
124 element.src = url+'/'+fileName; 122 element.src = url+'/'+fileName;
125 } 123 }
126 //Adding element once it is loaded 124 //Adding element once it is loaded