Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

Signed-off-by: Armen Kesablyan <armen@motorola.com>

2 files changed, 14 insertions, 12 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 7c3bc2c4..12dbf660 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -186,6 +186,9 @@
                 "properties": {
                     "element": {"#": "stageAndScenesContainer"},
                     "appModel":     {"@": "appModel"}
+                },
+                "bindings": {
+                    "activeDocument": {"<-": "@documentController1.activeDocument"}
                 }
             },
 
@@ -263,11 +266,7 @@
             "selectionController1": {
                 "prototype": "js/controllers/selection-controller",
                 "bindings" : {
-                    "selectionContainer": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "currentSelectedContainer",
-                        "oneway": true
-                    }
+                    "selectionContainer": {"<-": "@owner.currentSelectedContainer"}
                 }
             },
 
@@ -287,7 +286,10 @@
             },
 
             "stylesController": {
-                "prototype": "js/controllers/styles-controller"
+                "prototype": "js/controllers/styles-controller",
+                "bindings": {
+                    "activeDocument": {"<-": "@documentController1.activeDocument"}
+                }
             },
 
             "presetsController": {
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 537d7eb0..d97a5413 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -172,9 +172,9 @@ exports.Ninja = Montage.create(Component, {
 
             this.application.ninja = this;
 
-            this.toolsData.selectedTool = this.toolsData.defaultToolsData[0];
-            this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[7].subtools;
-            this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[7].subtools[1];
+            this.toolsData.selectedTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex];
+            this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools;
+            this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[1];
             this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action];
 
             this.setupGlobalHelpers();
@@ -185,9 +185,9 @@ exports.Ninja = Montage.create(Component, {
             this.eventManager.addEventListener( "selectSubTool", this, false);
             this.eventManager.addEventListener( "onOpenDocument", this, false);
 
-            this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false);
-            this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false);
-            this.addEventListener("change@appModel.debug", this.toggleDebug, false);
+            this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false);
+            this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false);
+            this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false);
 
             NJevent("appLoading");
         }