aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorhwc4872012-02-22 10:58:40 -0800
committerhwc4872012-02-22 10:58:40 -0800
commit1a72686c9b915c488f9b430995787d2176671561 (patch)
tree849ca3d54f68c6c327c3daa240b48c7be6f73e91 /js/ninja.reel/ninja.html
parentbb441ec8f8080cdaa52257a40531c62c47028667 (diff)
parent2f24dafec79583547fe663d5a387d8ef15aae3bf (diff)
downloadninja-1a72686c9b915c488f9b430995787d2176671561.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
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