aboutsummaryrefslogtreecommitdiff
path: root/js/models/element-model.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-08 12:59:13 -0700
committerValerio Virgillito2012-06-08 12:59:13 -0700
commita50814178be2775892ed999c28041d8e81291e22 (patch)
tree309af98cd840d3841be74c32e87c30fa8739ff1e /js/models/element-model.js
parent4070475b8da7257eca629be7288bf7a31d5e384e (diff)
parentd14249dd2d76e9eb8d14733c10393d36bd2ea8ee (diff)
downloadninja-a50814178be2775892ed999c28041d8e81291e22.tar.gz
Merge branch 'refs/heads/master' into timeline-resizer-fix
Diffstat (limited to 'js/models/element-model.js')
-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")) {