Author: nbelaevski Date: 2009-05-12 18:00:41 -0400 (Tue, 12 May 2009) New Revision: 14144 Modified: trunk/ui/colorPicker/ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx Log: https://jira.jboss.org/jira/browse/RF-6697 Property changes on: trunk/ui/colorPicker ___________________________________________________________________ Name: svn:ignore - target .classpath .project .settings + target .classpath .project .settings .clover Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-05-12 18:02:07 UTC (rev 14143) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-05-12 22:00:41 UTC (rev 14144) @@ -146,13 +146,13 @@ - this.selector = this.picker.find('div.rich-color-picker-color').bind('mousedown', function(e) { return self._downSelector.call(self, e); }); - this.selectorIndic = this.selector.find('div div'); - this.hue = this.picker.find('div.rich-color-picker-rainbow div'); - this.picker.find('div.rich-color-picker-rainbow').bind('mousedown', function(e) { return self._downHue.call(self, e); }); + this.selector = this.picker.find('.rich-color-picker-color').bind('mousedown', function(e) { return self._downSelector.call(self, e); }); + this.selectorIndic = this.selector.find('* *'); + this.hue = this.picker.find('.rich-color-picker-rainbow > *:not(:first)'); + this.picker.find('.rich-color-picker-rainbow').bind('mousedown', function(e) { return self._downHue.call(self, e); }); - this.newColor = this.picker.find('div.rich-color-picker-new-color'); - this.currentColor = this.picker.find('div.rich-color-picker-current-color'); + this.newColor = this.picker.find('.rich-color-picker-new-color'); + this.currentColor = this.picker.find('.rich-color-picker-current-color'); this.iconColor = $('.rich-color-picker-icon', this.element); this.picker.find('.rich-color-picker-submit') @@ -322,7 +322,7 @@ _downHue: function(e) { this.currentHue = { - y: this.picker.find('div.rich-color-picker-rainbow').offset().top + y: this.picker.find('.rich-color-picker-rainbow').offset().top }; this._select.apply(this, [e, this @@ -357,7 +357,7 @@ var self = this; this.currentSelector = { - pos: this.picker.find('div.rich-color-picker-color').offset() + pos: this.picker.find('.rich-color-picker-color').offset() }; this._select.apply(this, [e, this Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx =================================================================== --- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-05-12 18:02:07 UTC (rev 14143) +++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-05-12 22:00:41 UTC (rev 14144) @@ -105,7 +105,7 @@ </div> <div style="display: none;" id="#{clientId}-colorPicker-script"> <script type="text/javascript"> - jQuery('div.rich-color-picker-color').pngFix(); + jQuery('.rich-color-picker-color').pngFix(); <jsp:scriptlet><![CDATA[ Boolean flat = (Boolean) component.getAttributes().get("flat"); colorMode = (String) component.getAttributes().get("colorMode");