aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorJonathan Duran2012-07-23 08:25:56 -0700
committerJonathan Duran2012-07-23 08:25:56 -0700
commite7268388a99722dd7bb64506893538fd0ee96a71 (patch)
tree9e0f960030f1625f730bbd60ca79ce449a788df0 /js/models
parent3487c690d526534f27578acdffe1a45f2526cbf6 (diff)
parent2b05717e49bafc4b401441d9a55153b9e4ae7e43 (diff)
downloadninja-e7268388a99722dd7bb64506893538fd0ee96a71.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'js/models')
-rwxr-xr-xjs/models/element-model.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/models/element-model.js b/js/models/element-model.js
index 07abbd40..7d8e6ebb 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -53,7 +53,7 @@ var modelGenerator = exports.modelGenerator = function() {
53 }) 53 })
54 }); 54 });
55 55
56 if(this._model.selection !== "body") { 56 if(this._model.selection !== "body" && this.nodeName.toLowerCase() !== "ninja-content") {
57 this._model.props3D.init(this, false); 57 this._model.props3D.init(this, false);
58 } 58 }
59 59
@@ -75,9 +75,9 @@ var getInfoForElement = function(el) {
75 } 75 }
76 76
77 if(el.nodeName.toLowerCase() === "ninja-content") { 77 if(el.nodeName.toLowerCase() === "ninja-content") {
78 elementName = "body"; 78 elementName = "div";
79 controller = elementNameToController(elementName); 79 controller = elementNameToController("body");
80 pi = elementNameToPi(elementName); 80 pi = elementNameToPi("body");
81 } 81 }
82 82
83 // TODO: Add this in case there is no controller for the component 83 // TODO: Add this in case there is no controller for the component