aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-12 09:47:52 -0700
committerJose Antonio Marquez2012-06-12 09:47:52 -0700
commit5a46f92f3127f7cc7870f125e8da2b44c2891fd0 (patch)
tree5604e15409ade61bf8b68bf0a5a2401edff1a0ee /js/ninja.reel/ninja.js
parent19c77d87df72a85345e527d790878fc65eca189a (diff)
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-5a46f92f3127f7cc7870f125e8da2b44c2891fd0.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI
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 f0f8b46d..2d43af7a 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;
@@ -325,11 +310,6 @@ exports.Ninja = Montage.create(Component, {
325 // TODO: Remove this when integrating the next montage 310 // TODO: Remove this when integrating the next montage
326 this.documentList.selectedObjects = [doc]; 311 this.documentList.selectedObjects = [doc];
327 312
328 if(doc.currentView === "design") {
329 // TODO: Bind directly to the model of the document in components instead of this property
330 this._currentSelectedContainer = null;
331 this.currentSelectedContainer = doc.model.documentRoot;
332 }
333 } 313 }
334 }, 314 },
335 315