Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal into file-io

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 9de0e86e..022b3f0a 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -228,7 +228,15 @@
 
             "selectionController1": {
                 "module": "js/controllers/selection-controller",
-                "name": "SelectionController"
+                "name": "SelectionController",
+                "bindings" : {
+                    "selectionContainer": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "currentSelectedContainer",
+                        "oneway": true
+                    }
+                }
+
             },
 
             "documentController1": {