diff options
author | John Mayhew | 2012-02-08 14:39:16 -0800 |
---|---|---|
committer | John Mayhew | 2012-02-08 14:39:16 -0800 |
commit | b6bc8b0bb91382991e6e43ad341304c813124882 (patch) | |
tree | 9ab504c981d2cf3be96a9f80ce638a85300489db /js/mediators | |
parent | c7b5edf0351d678d26b17eb5e2f995a140e209bb (diff) | |
parent | ab12be4e9a0d9fee4450795077b0107983b5682e (diff) | |
download | ninja-b6bc8b0bb91382991e6e43ad341304c813124882.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/mediators')
-rw-r--r-- | js/mediators/drag-drop-mediator.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js index aacb228c..ede71383 100644 --- a/js/mediators/drag-drop-mediator.js +++ b/js/mediators/drag-drop-mediator.js | |||
@@ -122,7 +122,7 @@ exports.DragDropMediator = Montage.create(Component, { | |||
122 | 122 | ||
123 | NJUtils.makeElementModel(domElem, "SVG", "block"); | 123 | NJUtils.makeElementModel(domElem, "SVG", "block"); |
124 | } else { // treat as a regular image | 124 | } else { // treat as a regular image |
125 | domElem = NJUtils.makeNJElement("image", "Image", "block"); | 125 | domElem = NJUtils.makeNJElement("image", "image", "image"); |
126 | domElem.src = evt2.currentTarget.result; | 126 | domElem.src = evt2.currentTarget.result; |
127 | } | 127 | } |
128 | 128 | ||