aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-12 07:09:56 -0700
committerPushkar Joshi2012-06-12 07:09:56 -0700
commitfa1dcaaed3d0ed83ef7982ff198dd241c8b9670e (patch)
treefbd5b770dcbf6a23f2b10971f2485a4ef4451c9f /js/ninja.reel/ninja.js
parent71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (diff)
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-fa1dcaaed3d0ed83ef7982ff198dd241c8b9670e.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js20
1 files changed, 0 insertions, 20 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 38f5efcf..b57aecd2 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -147,21 +147,6 @@ exports.Ninja = Montage.create(Component, {
147 value: [] 147 value: []
148 }, 148 },
149 149
150 _currentSelectedContainer: {
151 value: null
152 },
153
154 currentSelectedContainer: {
155 get: function() {
156 return this._currentSelectedContainer;
157 },
158 set: function(value) {
159 if(value !== this._currentSelectedContainer) {
160 this._currentSelectedContainer = value;
161 }
162 }
163 },
164
165 templateDidLoad: { 150 templateDidLoad: {
166 value: function() { 151 value: function() {
167 this.ninjaVersion = window.ninjaVersion.ninja.version; 152 this.ninjaVersion = window.ninjaVersion.ninja.version;
@@ -321,11 +306,6 @@ exports.Ninja = Montage.create(Component, {
321 // TODO: Remove this when integrating the next montage 306 // TODO: Remove this when integrating the next montage
322 this.documentList.selectedObjects = [doc]; 307 this.documentList.selectedObjects = [doc];
323 308
324 if(doc.currentView === "design") {
325 // TODO: Bind directly to the model of the document in components instead of this property
326 this._currentSelectedContainer = null;
327 this.currentSelectedContainer = doc.model.documentRoot;
328 }
329 } 309 }
330 }, 310 },
331 311