Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/io/system/ninjalibrary.json

2 files changed, 21 insertions, 44 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index ae3e2022..0dabc781 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -32,30 +32,23 @@
                         }
                     ],
                     "bindings": {
-                        "label": {
-                            "boundObject": {"@": "repetition1"},
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.label",
-                            "oneway": true
-                        },
-                        "value": {
-                            "boundObject": {"@": "repetition1"},
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid",
-                            "oneway": true
-                        }
+                        "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
+                        "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
+                    }
+                },
+
+                "buttonsListController": {
+                    "prototype": "montage/ui/controller/array-controller",
+                    "bindings": {
+                        "content": {"<<->": "@owner.containerElements"}
                     }
                 },
 
-                "repetition1": {
+                "buttonsList": {
                     "prototype": "montage/ui/repetition.reel",
                     "properties": {
-                        "element": {"#": "breadcrumb_container"}
-                    },
-                    "bindings": {
-                        "objects": {
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "containerElements",
-                            "oneway": true
-                        }
+                        "element": {"#": "breadcrumb_container"},
+                        "contentController": {"@": "buttonsListController"}
                     }
                 },
 
@@ -65,11 +58,7 @@
                         "element": {"#": "disabledCondition"}
                     },
                     "bindings": {
-                        "condition": {
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "disabled",
-                            "oneway": true
-                        }
+                        "condition": {"<-": "@owner.disabled"}
                     }
                 }
             }
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index c1b021a3..49dbe3cb 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -21,9 +21,9 @@ exports.Breadcrumb = Montage.create(Component, {
 
     handleCloseDocument: {
         value: function(){
-            if(!this.application.ninja.documentController.activeDocument) {
+            if(!this.application.ninja.documentController.activeDocument && this.application.ninja.currentDocument.currentView !== "code") {
                 this.disabled = true;
-                this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.documentRoot : null);
+                this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.model.documentRoot : null);
             }
         }
     },
@@ -60,30 +60,18 @@ exports.Breadcrumb = Montage.create(Component, {
         value: function() {
             var parentNode;
 
-            this.containerElements.length = 0;
+//            delete this.containerElements;
+                this.containerElements = [];
 
             parentNode = this.container;
 
-            // This is for the old template support.
-            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
-            if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
-                while(parentNode.id !== "UserContent") {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-
-                // This is always the top container which is now hardcoded to body
-                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-            } else {
-                while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-
-                // This is always the top container which is now hardcoded to body
+            while(parentNode !== this.application.ninja.currentDocument.model.documentRoot) {
                 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                parentNode = parentNode.parentNode;
             }
 
+            // This is always the top container which is now hardcoded to body
+            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
         }
     },