diff options
author | Jose Antonio Marquez | 2012-07-23 10:19:42 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-07-23 10:19:42 -0700 |
commit | 02c0ed30e3948c80189d862802fb3db637a658cc (patch) | |
tree | d26ceac54ff6532105f479faa67b495278490c39 /js/models/element-model.js | |
parent | 5a4100de56bac351d7ee677bc85257ded5f5aee1 (diff) | |
parent | 2b05717e49bafc4b401441d9a55153b9e4ae7e43 (diff) | |
download | ninja-02c0ed30e3948c80189d862802fb3db637a658cc.tar.gz |
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/models/element-model.js')
-rwxr-xr-x | js/models/element-model.js | 8 |
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 |