diff options
author | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
commit | b6c88f548c8d3756738e534418732710af733f03 (patch) | |
tree | d651ce2811019a3bccfd8be1326762cd2c601316 /js/ninja.reel/ninja.html | |
parent | 91123fef348ec54d89005adbc151e816856a6a18 (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-b6c88f548c8d3756738e534418732710af733f03.tar.gz |
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 3 |
1 files changed, 1 insertions, 2 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 | } |