Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 80 insertions, 42 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 51d74cb2..a98fca60 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -25,7 +25,10 @@
             },
 
             "appModel": {
-                "prototype": "js/models/app-model"
+                "prototype": "js/models/app-model",
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
+                }
             },
 
             "materialsModel": {
@@ -36,6 +39,9 @@
                 "prototype": "js/components/menu/menu.reel",
                 "properties": {
                     "element": {"#": "mainMenuBar"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
@@ -118,7 +124,7 @@
                 ]
             },
 
-            "Resizer": {
+            "resizer3": {
                 "prototype": "js/panels/resize-composer",
                 "properties": {
                     "element": {"#": "pasteboardResizer"},
@@ -144,51 +150,61 @@
                 ]
             },
 
+            "stylesController": {
+                "prototype": "js/controllers/styles-controller",
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
+                }
+            },
+
             "stageMode": {
                 "prototype": "js/components/layout/stage-mode.reel",
                 "properties": {
                     "element": {"#": "stageMode"}
                 },
                 "bindings" : {
-                    "livePreview": {
-                        "boundObject": {"@": "appModel"},
-                        "boundObjectPropertyPath": "livePreview",
-                        "oneway": false
-                    }
+                    "livePreview": {"<<->": "@appModel.livePreview"}
                 }
             },
 
-            "toolsList1": {
+            "toolsList": {
                 "prototype": "js/components/layout/tools-list.reel",
                 "properties": {
                     "element": {"#": "toolsList"},
                     "toolsData": {"@": "toolsData1"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
-            "toolsProperties1": {
+            "toolsProperties": {
                 "prototype": "js/components/layout/tools-properties.reel",
                 "properties": {
                     "element": {"#": "toolsProperties"},
                     "toolsData": {"@": "toolsData1"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
             "documentsTab": {
                 "prototype": "js/components/layout/documents-tab.reel",
                 "properties": {
-                    "element": {"#": "openDocumentsTabComponent"}
+                    "element": {"#": "openDocumentsTabComponent"},
+                    "contentController": {"@": "documentList"}
                 }
             },
 
-            "stage1": {
+            "stage": {
                 "prototype": "js/stage/stage.reel",
                 "properties": {
                     "element": {"#": "stageAndScenesContainer"},
                     "appModel":     {"@": "appModel"}
                 },
                 "bindings": {
-                    "activeDocument": {"<-": "@documentController1.activeDocument"}
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
@@ -196,6 +212,9 @@
                 "prototype": "js/components/layout/document-bar.reel",
                 "properties": {
                     "element": {"#": "documentBar"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
@@ -203,6 +222,9 @@
                 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
                 "properties": {
                     "element": {"#": "editorViewOptions"}
+                },
+                "bindings" : {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
@@ -212,6 +234,9 @@
                     "element": {"#": "rightPanelContent"},
                     "panelSplitter": {"@": "splitter3"},
                     "appModel":     {"@": "appModel"}
+                },
+                "bindings" : {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
@@ -221,19 +246,19 @@
                     "element":{"#" : "breadCrumbComponent"}
                 },
                 "bindings" : {
-                    "container": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "currentSelectedContainer",
-                        "oneway": false
-                    }
+                    "container": {"<-": "@owner.currentSelectedContainer"},
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
-             },
+            },
 
             "timeline": {
-               "prototype": "js/panels/Timeline/TimelinePanel.reel",
-               "properties": {
-                   "element": {"#": "timelinePanelComponent"}
-               }
+                "prototype": "js/panels/Timeline/TimelinePanel.reel",
+                "properties": {
+                    "element": {"#": "timelinePanelComponent"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
+                }
             },
 
             "mouseMediator": {
@@ -263,15 +288,30 @@
                 "prototype": "js/controllers/undo-controller"
             },
 
-            "selectionController1": {
+            "selectionController": {
                 "prototype": "js/controllers/selection-controller",
                 "bindings" : {
-                    "selectionContainer": {"<-": "@owner.currentSelectedContainer"}
+                    "selectionContainer": {"<-": "@owner.currentSelectedContainer"},
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"},
+                    "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"}
                 }
             },
 
-            "documentController1": {
-                "prototype": "js/controllers/document-controller"
+            "documentController": {
+                "prototype": "js/controllers/document-controller",
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
+                }
+            },
+
+            "documentList": {
+                "prototype": "montage/ui/controller/array-controller",
+                "properties": {
+                    "selectObjectsOnAddition": true
+                },
+                "bindings": {
+                    "content": {"<<->": "@documentController.documents"}
+                }
             },
 
             "popupManager1": {
@@ -285,13 +325,6 @@