diff options
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 3 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 20 |
2 files changed, 1 insertions, 22 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a63422fb..00740ea9 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -246,7 +246,7 @@ | |||
246 | "element":{"#" : "breadCrumbComponent"} | 246 | "element":{"#" : "breadCrumbComponent"} |
247 | }, | 247 | }, |
248 | "bindings" : { | 248 | "bindings" : { |
249 | "container": {"<-": "@owner.currentSelectedContainer"}, | 249 | |
250 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | 250 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
251 | } | 251 | } |
252 | }, | 252 | }, |
@@ -291,7 +291,6 @@ | |||
291 | "selectionController": { | 291 | "selectionController": { |
292 | "prototype": "js/controllers/selection-controller", | 292 | "prototype": "js/controllers/selection-controller", |
293 | "bindings" : { | 293 | "bindings" : { |
294 | "selectionContainer": {"<-": "@owner.currentSelectedContainer"}, | ||
295 | "currentDocument": {"<-": "@documentList.selectedObjects.0"}, | 294 | "currentDocument": {"<-": "@documentList.selectedObjects.0"}, |
296 | "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} | 295 | "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} |
297 | } | 296 | } |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 33808cf3..8b874a36 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -297,21 +297,6 @@ exports.Ninja = Montage.create(Component, { | |||
297 | value: [] | 297 | value: [] |
298 | }, | 298 | }, |
299 | 299 | ||
300 | _currentSelectedContainer: { | ||
301 | value: null | ||
302 | }, | ||
303 | |||
304 | currentSelectedContainer: { | ||
305 | get: function() { | ||
306 | return this._currentSelectedContainer; | ||
307 | }, | ||
308 | set: function(value) { | ||
309 | if(value !== this._currentSelectedContainer) { | ||
310 | this._currentSelectedContainer = value; | ||
311 | } | ||
312 | } | ||
313 | }, | ||
314 | |||
315 | templateDidLoad: { | 300 | templateDidLoad: { |
316 | value: function() { | 301 | value: function() { |
317 | this.ninjaVersion = window.ninjaVersion.ninja.version; | 302 | this.ninjaVersion = window.ninjaVersion.ninja.version; |
@@ -471,11 +456,6 @@ exports.Ninja = Montage.create(Component, { | |||
471 | // TODO: Remove this when integrating the next montage | 456 | // TODO: Remove this when integrating the next montage |
472 | this.documentList.selectedObjects = [doc]; | 457 | this.documentList.selectedObjects = [doc]; |
473 | 458 | ||
474 | if(doc.currentView === "design") { | ||
475 | // TODO: Bind directly to the model of the document in components instead of this property | ||
476 | this._currentSelectedContainer = null; | ||
477 | this.currentSelectedContainer = doc.model.documentRoot; | ||
478 | } | ||
479 | } | 459 | } |
480 | }, | 460 | }, |
481 | 461 | ||