From 9d2c2a80483415d7560b00cda5519153db23e241 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sat, 11 Feb 2012 23:04:36 -0800
Subject: Bug Fixes

IKNINJA-1101
IKNINJA-1079
IKNINJA-1144
---
 js/panels/Color/colorpanelbase.reel/colorpanelbase.js         | 8 ++++----
 js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css  | 4 ++--
 js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'js/panels/Color')

diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index 9a27689a..ff738bbe 100644
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -1499,13 +1499,13 @@ exports.ColorPanelBase = Montage.create(Component, {
     				//
     				if (type._event.clientX && type._event.clientY) {
     					//
-    					if (type._event.clientX > (parseInt(document.width)/2)) {
+    					//if (type._event.clientX > (parseInt(document.width)/2)) {
     						//TODO: Fix offset hack
     						this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top');
-		    			} else {
+		    			//} else {
     						//
-    						this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top');
-    					}
+    					//	this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top');
+    					//}
     				}
     			}
     		} else {
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
index 6a418279..4db0abff 100644
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
@@ -6,7 +6,7 @@
  </copyright> */
 /* line 12, colorpanelpopup.scss */
 .cpp_popup {
-  overflow: none;
+  overflow: hidden;
   font-size: 12px;
   text-shadow: 1px 1px 1px #000;
   font-family: 'Droid Sans', sans-serif;
@@ -28,7 +28,7 @@
   text-indent: -9999px;
   overflow: hidden;
   float: right;
-  padding: none;
+  padding: 0;
   cursor: pointer;
   border: 1px solid transparent;
 }
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 20481fb6..1f63658a 100644
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
@@ -10,7 +10,7 @@ $grey_light: #494949;
 
 .cpp_popup
 {
-	overflow: none;
+	overflow: hidden;
 	font-size: 12px;
   	text-shadow: 1px 1px 1px #000;
   	font-family: 'Droid Sans', sans-serif;
@@ -32,7 +32,7 @@ $grey_light: #494949;
 	text-indent: -9999px;
 	overflow: hidden;
 	float: right;
-	padding: none;
+	padding: 0;
 	cursor: pointer;
 	border: 1px solid transparent;
 }
-- 
cgit v1.2.3


From 1c1862702f0356259c2e24fdccc3a5e42b6f03da Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 9 Mar 2012 15:21:26 -0800
Subject: Temp Gradient Fix

Temporary fix for getting gradient mode.
---
 js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'js/panels/Color')

diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 299e603d..3eae3ea3 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
@@ -379,11 +379,16 @@ exports.ColorPanelPopup = Montage.create(Component, {
     		gradient.element = container;
     		gradient.hack = this.hack; // TODO: Remove
     		//
-    		if (g && g.value && g.value.stops && g.value.mode) {
-    			gradient._mode = g.value.mode;
-    			gradient.value = g.value.stops;
+    		if (g && g.value && g.value.stops) {
+    			if (g.value.gradientMode) {
+    				gradient._mode = g.value.gradientMode;
+    				gradient.value = g.value.stops;
+    			} else {
+    				gradient._mode = 'linear';
+    				gradient.value = g.value.stops;
+    			}
     		} else {
-    			gradient._mode = this.defaultGradient.mode;
+    			gradient._mode = this.defaultGradient.gradientMode;
     			gradient.value = this.defaultGradient.stops;
     		}
     		//
-- 
cgit v1.2.3