aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-21 18:04:27 -0800
committerJose Antonio Marquez2012-02-21 18:04:27 -0800
commit25e6a03cf8af4bd0496a8b21c82332d76ddd9fff (patch)
tree9b4ef3a716139d5259261cae97e8603a1d33a91f /js/ninja.reel/ninja.html
parent20dc41e571ddec6b781653fac43e2ca34026937d (diff)
parent2f24dafec79583547fe663d5a387d8ef15aae3bf (diff)
downloadninja-25e6a03cf8af4bd0496a8b21c82332d76ddd9fff.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html12
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