From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/panels/Color/colorpanelbase.reel/colorpanelbase.html    |   0
 js/panels/Color/colorpanelbase.reel/colorpanelbase.js      |   0
 js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css |   0
 js/panels/Color/colorpanelbase.reel/img/icon_default.png   | Bin
 js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png   | Bin
 js/panels/Color/colorpanelbase.reel/img/icon_swap.png      | Bin
 js/panels/Color/colorpanelbase.reel/img/knob.png           | Bin
 7 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/colorpanelbase.html
 mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/colorpanelbase.js
 mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
 mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/icon_default.png
 mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
 mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/icon_swap.png
 mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/knob.png

(limited to 'js/panels/Color/colorpanelbase.reel')

diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
old mode 100644
new mode 100755
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
old mode 100644
new mode 100755
diff --git a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
old mode 100644
new mode 100755
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_default.png b/js/panels/Color/colorpanelbase.reel/img/icon_default.png
old mode 100644
new mode 100755
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
old mode 100644
new mode 100755
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
old mode 100644
new mode 100755
diff --git a/js/panels/Color/colorpanelbase.reel/img/knob.png b/js/panels/Color/colorpanelbase.reel/img/knob.png
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 7b0910720a6979bf41c216c5072d5c7a91e6d0b7 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 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/panels/Color/colorpanelbase.reel')

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 {
-- 
cgit v1.2.3