diff options
author | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
commit | 211f514882144de8df69ebb2106f3b446be1dda0 (patch) | |
tree | c8eaf3d9fc7ac1bc841320e73d41818fbfb5827d /js/mediators/drag-drop-mediator.js | |
parent | 5a5d0f68dd82b829405a0b301dd11b4cf385c8d5 (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-211f514882144de8df69ebb2106f3b446be1dda0.tar.gz |
Merge branch 'refs/heads/master' into BugFixes
Diffstat (limited to 'js/mediators/drag-drop-mediator.js')
-rwxr-xr-x | js/mediators/drag-drop-mediator.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js index 8663b06e..9d1b69a9 100755 --- a/js/mediators/drag-drop-mediator.js +++ b/js/mediators/drag-drop-mediator.js | |||
@@ -111,6 +111,7 @@ exports.DragDropMediator = Montage.create(Component, { | |||
111 | fileName = tempName; | 111 | fileName = tempName; |
112 | } | 112 | } |
113 | if (save && save.success && save.status === 201) { | 113 | if (save && save.success && save.status === 201) { |
114 | var self = this; | ||
114 | // | 115 | // |
115 | if (e.currentTarget.fileType.indexOf('svg') !== -1) { | 116 | if (e.currentTarget.fileType.indexOf('svg') !== -1) { |
116 | element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper | 117 | element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper |
@@ -121,9 +122,10 @@ exports.DragDropMediator = Montage.create(Component, { | |||
121 | element.src = url+'/'+fileName; | 122 | element.src = url+'/'+fileName; |
122 | } | 123 | } |
123 | //TODO: Remove temp fix for elements to redraw on drop | 124 | //TODO: Remove temp fix for elements to redraw on drop |
125 | |||
124 | element.onload = function () { | 126 | element.onload = function () { |
125 | NJevent("elementAdding", {el: element, data: rules}); | 127 | self.application.ninja.elementMediator.addElements(element, rules); |
126 | } | 128 | }; |
127 | // | 129 | // |
128 | rules = { | 130 | rules = { |
129 | 'position': 'absolute', | 131 | 'position': 'absolute', |
@@ -133,7 +135,7 @@ exports.DragDropMediator = Montage.create(Component, { | |||
133 | '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)' | 135 | '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)' |
134 | }; | 136 | }; |
135 | // | 137 | // |
136 | NJevent("elementAdding", {el: element, data: rules}); | 138 | self.application.ninja.elementMediator.addElements(element, rules); |
137 | } else { | 139 | } else { |
138 | //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT | 140 | //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT |
139 | } | 141 | } |