aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorAnanya Sen2012-06-08 17:09:55 -0700
committerAnanya Sen2012-06-08 17:09:55 -0700
commit19d9da2ae655f0b531aa0e348a15bcf9d673a776 (patch)
tree4ec453ac47c77b9d5872e0b78a1b17971a95ce3d /js/models
parent113ed223e9848d9838e574c67720d524653e704c (diff)
parentbad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff)
downloadninja-19d9da2ae655f0b531aa0e348a15bcf9d673a776.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/models')
-rwxr-xr-xjs/models/element-model.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/models/element-model.js b/js/models/element-model.js
index c9fb58d8..76f15b21 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -49,6 +49,12 @@ var getInfoForElement = function(el) {
49 isShape = true; 49 isShape = true;
50 } 50 }
51 51
52 if(el.nodeName.toLowerCase() === "ninja-content") {
53 elementName = "body";
54 controller = elementNameToController(elementName);
55 pi = elementNameToPi(elementName);
56 }
57
52 // TODO: Add this in case there is no controller for the component 58 // TODO: Add this in case there is no controller for the component
53 /* 59 /*
54 if(el.getAttribute("data-montage-id")) { 60 if(el.getAttribute("data-montage-id")) {