44 files changed, 59 insertions, 117 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/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
index fedc1d9d..cc8108f6 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -3,7 +3,12 @@
  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> */
-
+.treeRoot .branch-label, .treeRoot .leaf-label {
+    margin: 0 8px;
+}
+.treeRoot .leaf-label:hover {
+    margin: 0;
+}
 .treeRoot .leaf-label {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAIAAAD9iXMrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEQzcwMEU1RjQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEQzcwMEU2MDQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkRDNzAwRTVENDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkRDNzAwRTVFNDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2BUcaK3QAAANFJREFUeNqMULEOREAQdYjvuE%2FYWlSUQqKQ7A%2FsD6n0SoVCFHpRa0SllvgFlpvzZO9OcfGSnbx9M%2FNmMpp2Dw96VVX9L%2FJ93wRrmkZJIKrZcRyK%2Bs25p5%2BU8pK4KCakMAzxL4oCJIqivu8Nw0DDu25ZFtW3ritIkiS0tGVZtm1%2F6rZtu4yr67osSyJBEJx3ybKsbVukOecU4zh2XRfKMAzTNJmYpWxgPM%2BzEIIxRrzrOs%2FzdMyVvyAxTdPxAJFzv%2BeBbz8cfN93kDzPb55ZewkwAF0Ddf6ATSsHAAAAAElFTkSuQmCC);
     background-position: 3px center;
@@ -12,6 +17,11 @@
     cursor: pointer;
     padding: 3px 0 4px;
 }
+.branch .branch .leaf-label:hover {
+    background-color: #333333;
+    background-position: 33px center;
+    padding-left: 53px;
+}
 /* First level */
 .branch .leaf-label {
     padding-left: 25px;
@@ -26,4 +36,4 @@
 .branch .branch .branch .leaf-label {
     background-position: 45px center;
     padding-left: 65px;
-}
\ No newline at end of file
+}
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 59da411f..1c00f7ea 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -721,8 +721,17 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         drawSelectionBounds : {
                 value: function( eltArray ) {
                         this._selectionCtr = null;
+            var len = eltArray.length,
+                i,
+                j,
+                bounds,
+                bounds3D,
+                pt,
+                tmpPt,
+                ssMat,
+                elt;
                         
-                        if (eltArray.length == 0)  return;
+                        if (len === 0)  return;
                         var context = this._drawingContext;
                         if (!context)  return;
 
@@ -731,18 +740,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         context.lineWidth = 2;
 
                         // handle the single element case
-                        if (eltArray.length == 1)
+            // TODO - Currently, the stage draws its own selection bounds for single selection case
+                        if (len === 1)
                         {
                                 // single selection case
                                 //console.log( "single selection" );
 
-                                var elt = eltArray[0];
+                                elt = eltArray[0];
 
                                 this.viewUtils.pushViewportObj( elt );
 
                                 // get the element bounds in world space
-                                var bounds3D = this.viewUtils.getElementViewBounds3D( elt );
-                                for (var j=0;  j<4;  j++) {
+                                bounds3D = this.viewUtils.getElementViewBounds3D( elt );
+                                for (j=0;  j<4;  j++) {
                                         bounds3D[j] = this.viewUtils.localToGlobal( bounds3D[j],  elt );
                                 }
 
@@ -766,19 +7