diff options
author | Valerio Virgillito | 2012-04-26 11:24:11 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-26 11:24:11 -0700 |
commit | 902dc18296fc78f3b8e67d952c42981d926bb2fc (patch) | |
tree | 29109daaa4b806e5a7807713189f20896d0e4a2b /js/mediators | |
parent | 575c8a8fb6b32d01d48d94b55a0d469ad4ddebc8 (diff) | |
parent | d193e087bf24b538b6d88ae501b4b6e9781f501b (diff) | |
download | ninja-902dc18296fc78f3b8e67d952c42981d926bb2fc.tar.gz |
Merge pull request #179 from joseeight/FileIO
Fixing duplicate layer bug
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/drag-drop-mediator.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js index eedab8fc..b0aba5b6 100755 --- a/js/mediators/drag-drop-mediator.js +++ b/js/mediators/drag-drop-mediator.js | |||
@@ -115,25 +115,25 @@ 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.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper | 117 | element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper |
118 | element.type = 'image/svg+xml'; | ||
118 | element.src = url+'/'+fileName; | 119 | element.src = url+'/'+fileName; |
119 | element.type = 'image/svg+xml'; | ||
120 | } else { | 120 | } else { |
121 | element = NJUtils.makeNJElement('image', 'image', 'image'); | 121 | element = NJUtils.makeNJElement('image', 'image', 'image'); |
122 | element.src = url+'/'+fileName; | 122 | element.src = url+'/'+fileName; |
123 | } | 123 | } |
124 | //TODO: Remove temp fix for elements to redraw on drop | 124 | //Adding element once it is loaded |
125 | |||
126 | element.onload = function () { | 125 | element.onload = function () { |
127 | self.application.ninja.elementMediator.addElements(element, rules); | 126 | element.onload = null; |
127 | self.application.ninja.elementMediator.addElements(element, rules, true); | ||
128 | }; | 128 | }; |
129 | // | 129 | //Setting rules of element |
130 | rules = { | 130 | rules = { |
131 | 'position': 'absolute', | 131 | 'position': 'absolute', |
132 | 'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px', | 132 | 'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px', |
133 | 'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px' | 133 | 'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px' |
134 | }; | 134 | }; |
135 | // | 135 | // |
136 | self.application.ninja.elementMediator.addElements(element, rules); | 136 | self.application.ninja.elementMediator.addElements(element, rules, false); |
137 | } else { | 137 | } else { |
138 | //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT | 138 | //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT |
139 | } | 139 | } |