Merge branch 'refs/heads/Ninja-Internal' into Document

14 files changed, 228 insertions, 39 deletions

diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index da4e8c0f..b10f6624 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -213,21 +213,13 @@ exports.GradientPicker = Montage.create(Component, {
     removeStop: {
         enumerable: false,
         value: function(stop) {
-                //Removing stops
-                this.element._components.stopsContainer.removeChild(stop);
-                //Stopping events related to this current stop
-                this.removeStopMoving();
-                //Resetting stops if less than 2
                 var i, buttons = this.element._components.stopsContainer.getElementsByTagName('button');
-                if (buttons.length < 2) {
-                        //Removing remaining stops prior to resetting
-                        for (i=0; buttons[i]; i++) {
-                                this.element._components.stopsContainer.removeChild(buttons[i].stop);
-                        }
-                        //Nulling then adding defaults
-                        this.value = null;
-                        this.addDefaultStops();
-                        this._dispatchEvent('change', false);
+                //
+                if (buttons.length > 2) {
+                        //Removing stops
+                        this.element._components.stopsContainer.removeChild(stop);
+                        //Stopping events related to this current stop
+                        this.removeStopMoving();
                 }
         }
     },
@@ -327,7 +319,7 @@ exports.GradientPicker = Montage.create(Component, {
                 //
                 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup();
                 //
-                if ((e._event.y+this.hack.y) > this.element._trackY+50 || (e._event.y+this.hack.y) < this.element._trackY) {
+                if ((e._event.y+this.hack.y) > this.element._trackY+70 || (e._event.y+this.hack.y) < this.element._trackY) {
                         this.removeStop(this.currentStop);
                 }
                 //
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index 67497e10..dcfd471c 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -8,7 +8,7 @@
     background-color: #282828;
     border-style: double;
     height: 26px;
-
+    position:relative;
     -webkit-box-flex: 0;
 }
 
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index f2368e9a..413f588d 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -60,6 +60,20 @@
                             "oneway": true
                         }
                     }
+                },
+
+                "disable": {
+                    "prototype": "montage/ui/condition.reel",
+                    "properties": {
+                        "element": {"#": "disabledCondition"}
+                    },
+                    "bindings": {
+                        "condition": {
+                            "boundObject": {"@": "owner"},
+                            "boundObjectPropertyPath": "disabled",
+                            "oneway": true
+                        }
+                    }
                 }
             }
         </script>
@@ -71,6 +85,7 @@
             <div id="breadcrumb_container">
                 <button id="breadcrumb_button" class="nj-skinned"></button>
             </div>
+            <div id="disabledCondition" class="panelDisabled"></div>
         </section>
 
     </body>
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index b2fa42b1..f35972b6 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -9,6 +9,24 @@ var Montage = require("montage/core/core").Montage,
 
 exports.Breadcrumb = Montage.create(Component, {
 
+    disabled: {
+        value: true
+    },
+
+    handleOpenDocument: {
+        value: function(){
+            this.disabled = false;
+        }
+    },
+
+    handleCloseDocument: {
+        value: function(){
+            if(!this.application.ninja.documentController.activeDocument) {
+                this.disabled = true;
+            }
+        }
+    },
+
     _container:{
         value:null
     },
@@ -31,6 +49,8 @@ exports.Breadcrumb = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            this.eventManager.addEventListener("openDocument", this, false);
+            this.eventManager.addEventListener("closeDocument", this, false);
             this.breadcrumbBt.addEventListener("action", this, false);
         }
     },
@@ -51,8 +71,7 @@ exports.Breadcrumb = Montage.create(Component, {
             // This is always the top container which is now hardcoded to body
             this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
 
-            // This is for the timeline -- Disable it since the timeline should not know about this object
-            // NJevent('layerBinding',{selected:false ,element:this.container})
+
 
         }
     },
diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index 2a147964..f3e5de07 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -4,8 +4,6 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 .documentBar {
-    height: 25px;
-    width: 1000px;
     position: relative;
     overflow: hidden;
     color: white;
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 48f1423c..bd13f231 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -32,6 +32,20 @@
                 }
             },
 
+            "disable": {
+                "prototype": "montage/ui/condition.reel",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
+            },
+
             "owner": {
                 "module": "js/components/layout/document-bar.reel",
                 "name": "DocumentBar",
@@ -53,6 +67,7 @@
         <input class="zoomHotText label" id="zoomControlHT"/>
         <span class="design-view disable" id="design">Design View</span>