aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-08 22:15:41 -0800
committerValerio Virgillito2012-02-08 22:15:41 -0800
commitc7df002135328edac03e72a1e4b331b2c72667f8 (patch)
treeee50509df494b069d1769b7b54afd83fd0178e64 /js/mediators
parent725c54ff4af40f70b7dbd4508da34d2909cea8bd (diff)
parent35ad4d6d2fac4432046141c63c0209cf3d00be5c (diff)
downloadninja-c7df002135328edac03e72a1e4b331b2c72667f8.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/mediators')
-rw-r--r--js/mediators/drag-drop-mediator.js2
-rw-r--r--js/mediators/element-mediator.js7
2 files changed, 8 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
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index c44e1cb5..9aefbca6 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -112,6 +112,13 @@ exports.ElementMediator = Montage.create(NJComponent, {
112 } 112 }
113 }, 113 },
114 114
115 replaceElement: {
116 value: function(el, el2) {
117 el2.elementModel = el.elementModel;
118 this.application.ninja.currentDocument.documentRoot.replaceChild(el2, el);
119 }
120 },
121
115 getNJProperty: { 122 getNJProperty: {
116 value: function(el, p) { 123 value: function(el, p) {
117 if(el.elementModel) { 124 if(el.elementModel) {