Merge branch 'master' into pentool

18 files changed, 20 insertions, 1267 deletions

diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index 0374e6a3..a9fbfbd9 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -12,15 +12,7 @@
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         
         <link rel="stylesheet" type="text/css" href="css/colorwheel.css">
-                
-                <script type="text/m-objects">
-                {
-                        "$rootObject": U("m-obj://colorwheel/uuid?mId=js/components/colorwheel", {
-                        "element": E("#colorwheel")
-                        })
-                }
-                </script>
-                
+
                 <script type="text/montage-serialization">
                         {
                 "owner": {
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index 361e36b2..f71c6705 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -12,15 +12,7 @@
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         
         <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
-                
-                <script type="text/m-objects">
-                {
-                        "$rootObject": U("m-obj://gradientpicker/uuid?mId=js/components/gradientpicker", {
-                        "element": E("#gradientpicker")
-                        })
-                }
-                </script>
-                
+
                 <script type="text/montage-serialization">
                         {
                 "owner": {
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index f35972b6..597577f1 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -63,16 +63,27 @@ exports.Breadcrumb = Montage.create(Component, {
 
             parentNode = this.container;
 
-            while(parentNode.id !== "UserContent") {
+            // 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
                 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                parentNode = parentNode.parentNode;
+                console.log("this works!");
             }
 
-            // This is always the top container which is now hardcoded to body
-            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-
-
-
         }
     },
 
diff --git a/js/components/tree.reel/tree.css b/js/components/tree.reel/tree.css
deleted file mode 100755
index 8872341f..00000000
--- a/js/components/tree.reel/tree.css
+++ /dev/null
@@ -1,26 +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> */
-
-.tree
-{
-    -webkit-user-select:none;
-    cursor:default;
-    float: left;
-    padding-left: 0;
-}
-
-.tree li
-{
-    -webkit-margin-before: 0px;
-    -webkit-margin-after: 0px;
-    list-style-type:none;
-}
-
-.tree li > text > img
-{
-    margin-right:8px;
-    -webkit-transition: -webkit-transform 0.05s linear;
-}
\ No newline at end of file
diff --git a/js/components/tree.reel/tree.html b/js/components/tree.reel/tree.html
deleted file mode 100755
index 66838d82..00000000
--- a/js/components/tree.reel/tree.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<!-- <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> -->
-<html>
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <script type="text/montage-serialization">
-        {
-            "owner": {
-                "module": "js/components/tree.reel",
-                "name": "Tree",
-                "properties": {
-                    "element": {"#": "tree"}
-                }
-            }
-
-        }
-                </script>
-
-</head>
-<body>
-<ul id="tree" class="tree">
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/js/components/tree.reel/tree.js b/js/components/tree.reel/tree.js
deleted file mode 100755
index 7084ba99..00000000
--- a/js/components/tree.reel/tree.js
+++ /dev/null
@@ -1,789 +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;
-var Component = require("montage/ui/component").Component;
-var nj = require("js/lib/NJUtils").NJUtils;
-
-exports.Tree = Montage.create(Component, {
-
-    _treeDepth: {
-        value: 1
-    },
-    treeDepth: {
-        get: function() {
-                return this._treeDepth;
-        },
-        set: function(value) {
-                this._treeDepth = value;
-        }
-    },
-    _depthHash: {
-        value: ""
-    },
-    depthHash: {
-        get: function() {
-                return this._depthHash;
-        },
-        set: function(strValue) {
-                this._depthHash = strValue;
-        }
-    },
-    _firstLevel: {
-        value: true
-    },
-    firstLevel: {
-        get: function() {
-                return this._firstLevel;
-        },
-        set: function(value) {
-                this._firstLevel = value;
-        }
-    },
-
-    _hasFocus: {
-        enumerable: false,
-        value: false
-    },
-
-    _selectedNode: {