11 files changed, 42 insertions, 64 deletions

diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 7fd5d918..6071f3c6 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -52,6 +52,11 @@ exports.GradientPicker = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    _trackData: {
+            value: {width: 0, x: 0, y: 0}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     prepareForDraw: {
         value: function() {
                 //
@@ -62,7 +67,7 @@ exports.GradientPicker = Montage.create(Component, {
     willDraw: {
         value: function() {
                 //Getting component views from layout
-                this.element._trackWidth = parseInt(getComputedStyle(this.trackChips).getPropertyCSSValue('width').cssText);
+                this._trackData.width = parseInt(getComputedStyle(this.trackChips).getPropertyCSSValue('width').cssText);
                 //TODO: Fix events and remove this hack
                 this.trackCover.addEventListener('mouseover', function () {
                                 if (!this._updating) {                  
@@ -83,13 +88,13 @@ exports.GradientPicker = Montage.create(Component, {
     //
     draw: {
         value: function() {
-                //
+                //Checking for mode to assign radio value
                 if (this.mode === 'linear') {
                         this.radioLinear.checked = 'true';
                 } else if (this.mode === 'radial') {
                         this.radioRadial.checked = 'true';
                 }
-                //
+                //Checkign for value to initialize stops
                 if (!this.value) {
                         this.addDefaultStops();
                         } else {
@@ -104,35 +109,17 @@ exports.GradientPicker = Montage.create(Component, {
     //
         didDraw: {
         value: function() {
-                        //
+                        //Adding event listener for stops
                         this.trackMain.addEventListener('click', this, false);
-                
-                
-                
-                
-                
-                ////////////////////////////////////////////////////////////
-                        ////////////////////////////////////////////////////////////
-                        //TODO: Determing a better way to get screen position
-                        var element = this.trackMain;
-                this.element._trackX = 0, this.element._trackY = 0;
-                //
-                        while (element && !isNaN(element.offsetLeft) && !isNaN(element.offsetTop)) {
-                        this.element._trackX += element.offsetLeft - element.scrollLeft;
-                        this.element._trackY += element.offsetTop - element.scrollTop;
-                        element = element.parentNode;
-                }
-                ////////////////////////////////////////////////////////////
-                ////////////////////////////////////////////////////////////
-                
-                //This is forever changing, not sure why
-                //console.log(this.element._trackX, this.element._trackY);
-                
-                
+                //Getting position of track
+                var point = webkitConvertPointFromNodeToPage(this.trackMain, new WebKitPoint(0, 0));
+                //Setting position of track to calculate movement
+                this._trackData.x = point.x;
+                this._trackData.y = point.y;    
         }
     },
     ////////////////////////////////////////////////////////////////////
-    //
+    //Default stops funtion (reset)
     addDefaultStops: {
         value: function() {
                 this.addStop({color: {mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}}, percent: 0}, true);
@@ -223,24 +210,10 @@ exports.GradientPicker = Montage.create(Component, {
                         } else if (percent>100) {
                                 percent = 100;
                         }
-                        
-                        
-                        
-                        
-                        ////////////////////////////////////////////////////////////
-                        ////////////////////////////////////////////////////////////
-                        //TODO: toggling visibility because of a browser bug
-                        stop.style.visibility = 'hidden'; //TODO: To be removed
-                        var adj = (parseInt(getComputedStyle(stop).getPropertyCSSValue('width').cssText)*percent/100)/this.element._trackWidth;
+                        //
+                        var adj = (parseInt(getComputedStyle(stop).getPropertyCSSValue('width').cssText)*percent/100)/this._trackData.width;
                         stop.style.left = Math.round(percent-Math.round(adj*100))+'%';
                         stop.button.stopPosition = percent;
-                        stop.style.visibility = 'visible'; //TODO: To be removed
-                        ////////////////////////////////////////////////////////////
-                        ////////////////////////////////////////////////////////////
-                        
-                        
-                        
-                        
                 } catch (e) {
                         //TEMP
                 }
@@ -292,15 +265,15 @@ exports.GradientPicker = Montage.create(Component, {
                 //
                 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup();
                 //
-                if ((e._event.y+this.hack.y) > this.element._trackY+70 || (e._event.y+this.hack.y) < this.element._trackY) {
+                if (e._event.y > this._trackData.y+70 || e._event.y < this._trackData.y) {
                         this.removeStop(this.currentStop);
                 }
                 //
-                if (this.currentStop.button.stopPosition !== Math.round(((e._event.x+this.hack.x)-(this.element._trackX-23))/this.element._trackWidth*100)) {
+                if (this.currentStop.button.stopPosition !== Math.round((e._event.x-this._trackData.x)/this._trackData.width*100)) {
                         this.trackCover.style.display = 'block';
                 }
                 //
-                this.positionStop(this.currentStop, Math.round(((e._event.x+this.hack.x)-(this.element._trackX-23))/this.element._trackWidth*100));
+                this.positionStop(this.currentStop, Math.round((e._event.x-this._trackData.x)/this._trackData.width*100));
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 803770db..08e87bf0 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -146,7 +146,11 @@ exports.Hintable = Montage.create(Editable, {
         },
         set: function(str) {
             var node = this._getFirstTextNode();
-            node.textContent = str;
+            if (node.textContent !== str) {
+                node.textContent = str;
+            }
+            
+            //node.innerText = str;
         }
     },
 
@@ -331,4 +335,4 @@ exports.Hintable = Montage.create(Editable, {
         distinct: true
     }
     
-});
\ No newline at end of file
+});
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 7d99a42a..8753e921 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -82,7 +82,7 @@
     <body>
         <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
             <div class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
             <div class="nj-divider divider-vertical">&nbsp;</div>
             <label class="label"> Width:</label>
             <div data-montage-id="strokeSize" class="label"></div>
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index cf68520f..e5df9bd3 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/