Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

9 files changed, 25 insertions, 118 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..d2a6b1e4 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -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.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});
         }
     },
 
diff --git a/js/document/templates/html/main.js b/js/document/templates/app/main.js
index ffa3fab2..a406abdb 100644
--- a/js/document/templates/html/main.js
+++ b/js/document/templates/app/main.js
@@ -43,6 +43,10 @@ exports.Main = Montage.create(Component, {
             window.mjsTemplateCreator = TemplateCreator;
             //
             window.mjsTemplate = Template;
+            //
+            var templateEvent = document.createEvent("CustomEvent");
+            templateEvent.initCustomEvent("mjsTemplateReady", false, true);
+            document.body.dispatchEvent(templateEvent);
                         
                         
             // Dispatch event when this template has loaded.
diff --git a/js/document/templates/banner/package.json b/js/document/templates/app/package.json
index 4f36090a..4f36090a 100755
--- a/js/document/templates/banner/package.json
+++ b/js/document/templates/app/package.json
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 91ef06de..f1ee3d98 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -81,7 +81,7 @@
         
         <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
     
-        <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+        <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
 
         <script type="text/montage-serialization" data-ninja-template="true">
         {
diff --git a/js/document/templates/banner/main.js b/js/document/templates/banner/main.js
deleted file mode 100644
index 2acbe8f3..00000000
--- a/js/document/templates/banner/main.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component,
-    Template =                  require("montage/ui/template").Template,
-    TemplateCreator =   require("tools/template/template-creator").TemplateCreator;
-
-exports.Main = Montage.create(Component, {
-
-    hasTemplate: {
-        value: false
-    },
-
-    /**
-     * Adding window hooks to callback into this object from Ninja.
-     */
-    templateDidLoad: {
-        value: function(){
-            var self = this;
-            window.addComponent = function(element, data, callback) {
-                var component;
-
-                component = require.async(data.path)
-                    .then(function(component) {
-                        var componentRequire = component[data.name];
-                        var componentInstance = componentRequire.create();
-
-                        componentInstance.element = element;
-
-                        componentInstance.needsDraw = true;
-                        componentInstance.ownerComponent = self;
-
-                        callback(componentInstance, element);
-                    })
-                    .end();
-
-            };
-
-            window.mjsTemplateCreator = TemplateCreator;
-            //
-            window.mjsTemplate = Template;
-
-            // Dispatch event when this template has loaded.
-            /*
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
-            document.body.dispatchEvent( newEvent );
-            */
-
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 24159841..933df157 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -62,7 +62,7 @@
                 }
         </script>
     
-        <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+        <script type="text/javascript" data-package="../app" src=".