similar updateDisplay

frost-nzcr4 · Apr 24, 2011 · ce57a16 · ce57a16
1 parent 7b21f70
commit ce57a16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/1/farbtastic.js b/src/1/farbtastic.js
@@ -139,9 +139,10 @@
 		 */
 		fb.updateDisplay = function () {
 			// Determine whether labels/markers should invert
-			fb.invert = fb.hsl[2] <= 0.5;
+			// :old: fb.invert = fb.hsl[2] <= 0.5;
+			fb.invert = (fb.rgb[0] * 0.3 + fb.rgb[1] * 0.59 + fb.rgb[2] * 0.11) <= 0.6;
 
-			// Saturation/Luminance gradient
+			// Update the solid background fill
 			fb.solidFill.css("backgroundColor", $.farbtastic.colorUtilities.pack($.farbtastic.colorUtilities.HSLToRGB([fb.hsl[0], 1, 0.5])));
 
 			// Draw markers
@@ -177,7 +178,8 @@
 			}
 
 			// Update the stored offset for the widget
-			fb.offset = $(fb.wheel).offset();
+			fb.offset = element.offset();
+//			fb.offset = $(fb.wheel).offset();
 
 			// Check which area is being dragged
 			var pos = $.farbtastic.widgetCoords(fb, event);

diff --git a/src/2/farbtastic.js b/src/2/farbtastic.js
@@ -341,6 +341,7 @@
 		 */
 		fb.updateDisplay = function () {
 			// Determine whether labels/markers should invert
+			// :old: fb.invert = fb.hsl[2] <= 0.5;
 			fb.invert = (fb.rgb[0] * 0.3 + fb.rgb[1] * 0.59 + fb.rgb[2] * 0.11) <= 0.6;
 
 			// Update the solid background fill
@@ -379,7 +380,8 @@
 			}
 
 			// Update the stored offset for the widget
-			fb.offset = $(container).offset();
+			fb.offset = element.offset();
+//			fb.offset = $(container).offset();
 
 			// Check which area is being dragged
 			var pos = $.farbtastic.widgetCoords(fb, event);