diff options
author | Nivesh Rajbhandari | 2012-02-22 11:04:18 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 11:04:18 -0800 |
commit | ecd0dc6ffd21aedfb5ae8f617af36e48a2ba72ce (patch) | |
tree | df63accaeccb899ab1ecc107ab361629a5ca3452 /js/ninja.reel/ninja.html | |
parent | 96a0a8c916533eb5625816192ed38488f639326d (diff) | |
parent | 2f24dafec79583547fe663d5a387d8ef15aae3bf (diff) | |
download | ninja-ecd0dc6ffd21aedfb5ae8f617af36e48a2ba72ce.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index c9f17e3b..022b3f0a 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -228,7 +228,15 @@ | |||
228 | 228 | ||
229 | "selectionController1": { | 229 | "selectionController1": { |
230 | "module": "js/controllers/selection-controller", | 230 | "module": "js/controllers/selection-controller", |
231 | "name": "SelectionController" | 231 | "name": "SelectionController", |
232 | "bindings" : { | ||
233 | "selectionContainer": { | ||
234 | "boundObject": {"@": "owner"}, | ||
235 | "boundObjectPropertyPath": "currentSelectedContainer", | ||
236 | "oneway": true | ||
237 | } | ||
238 | } | ||
239 | |||
232 | }, | 240 | }, |
233 | 241 | ||
234 | "documentController1": { | 242 | "documentController1": { |
@@ -255,7 +263,7 @@ | |||
255 | }, | 263 | }, |
256 | 264 | ||
257 | "filePickerController": { | 265 | "filePickerController": { |
258 | "module": "js/components/ui/FilePicker/file-picker-controller", | 266 | "module": "js/io/ui/file-picker/file-picker-controller", |
259 | "name": "FilePickerController" | 267 | "name": "FilePickerController" |
260 | }, | 268 | }, |
261 | 269 | ||