Author: artdaw Date: 2009-03-19 16:26:10 -0400 (Thu, 19 Mar 2009) New Revision: 13041 Removed: trunk/ui/colorPicker/src/main/config/component/README trunk/ui/colorPicker/src/main/java/org/richfaces/component/README trunk/ui/colorPicker/src/main/java/org/richfaces/ui/ trunk/ui/colorPicker/src/main/resources/org/richfaces/ui/ trunk/ui/colorPicker/src/main/templates/README Modified: trunk/ui/colorPicker/src/main/config/component/colorPicker.xml trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 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.core.js trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx Log: colorPicker: bug in Safari was fixed Deleted: trunk/ui/colorPicker/src/main/config/component/README =================================================================== Modified: trunk/ui/colorPicker/src/main/config/component/colorPicker.xml =================================================================== --- trunk/ui/colorPicker/src/main/config/component/colorPicker.xml 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/config/component/colorPicker.xml 2009-03-19 20:26:10 UTC (rev 13041) @@ -21,47 +21,41 @@ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase </superclass> </tag> - <property> - <name>flat</name> - <classname>java.lang.Boolean</classname> - <description> - Defines whether the component will be rendered flat. - </description> - <defaultvalue>false</defaultvalue> - </property> - <property> - <name>colorMode</name> - <classname>java.lang.String</classname> - <description> - Defines a color mode for the component input. Possible values are hex, rgb. - </description> - <defaultvalue><![CDATA["hex"]]></defaultvalue> - </property> - <property> - <name>showEvent</name> - <classname>java.lang.String</classname> - <description> - Defines the event that triggers the colorPicker. - Default value is "onclick". - </description> - <defaultvalue><![CDATA["onclick"]]></defaultvalue> - </property> - <property> - <name>value</name> - <classname>java.lang.String</classname> - <description> - The value of the component. You can define value as hex, RGB or HSB. - </description> - </property> <property> - <name>disabled</name> + <name>flat</name> <classname>java.lang.Boolean</classname> <description> - Defines whether the component is disabled. + Defines whether the component will be rendered flat. </description> - </property> - &ui_component_attributes; - &html_events; - &ui_input_attributes; + <defaultvalue>false</defaultvalue> + </property> + <property> + <name>colorMode</name> + <classname>java.lang.String</classname> + <description> + Defines a color mode for the component input. Possible values are hex, rgb. + </description> + <defaultvalue><![CDATA["hex"]]></defaultvalue> + </property> + <property> + <name>showEvent</name> + <classname>java.lang.String</classname> + <description> + Defines the event that triggers the colorPicker. + Default value is "onclick". + </description> + <defaultvalue><![CDATA["onclick"]]></defaultvalue> + </property> + <property> + <name>value</name> + <classname>java.lang.String</classname> + <description> + The value of the component. You can define value as hex, RGB or HSB. + </description> + <defaultvalue><![CDATA["#ffffff"]]></defaultvalue> + </property> + &ui_component_attributes; + &html_events; + &ui_input_attributes; </component> </components> Deleted: trunk/ui/colorPicker/src/main/java/org/richfaces/component/README =================================================================== Modified: trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java =================================================================== --- trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java 2009-03-19 20:26:10 UTC (rev 13041) @@ -1,11 +1,12 @@ package org.richfaces.renderkit; -import java.io.IOException; import java.util.Map; +import java.util.Set; import javax.faces.component.UIComponent; import javax.faces.component.UIInput; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; import org.ajax4jsf.util.InputUtils; import org.richfaces.component.UIColorPicker; @@ -39,4 +40,13 @@ return inputValue; } + public void addPopupToAjaxRendered(FacesContext context, UIColorPicker component) { + AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); + Set<String> ajaxRenderedAreas = ajaxContext.getAjaxRenderedAreas(); + String clientId = component.getClientId(context); + if (ajaxContext.isAjaxRequest() && ajaxRenderedAreas.contains(clientId)) { + ajaxRenderedAreas.add(clientId + "-colorPicker-popup"); + ajaxRenderedAreas.add(clientId + "-colorPicker-script"); + } + } } \ No newline at end of file Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-03-19 20:26:10 UTC (rev 13041) @@ -7,11 +7,11 @@ .rich-colorPicker-wrapper{ display:none; height:176px; - !height:166px; overflow:hidden; position:absolute; width:350px; margin-top: 2px; + !margin-top: 0px; } .rich-colorPicker-ext{ border: 1px solid; @@ -144,7 +144,6 @@ position:absolute; right:75px; top:144px; - border: 1px solid; } .rich-colorPicker-cancel{ right:7px; @@ -218,4 +217,14 @@ <f:resource f:key="org/richfaces/renderkit/html/images/rangearrows.gif" /> </u:style> </u:selector> + <u:selector name=".rich-colorPicker-submit"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="color" skin="controlTextColor" /> + </u:selector> + <u:selector name=".rich-colorPicker-cancel"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="color" skin="controlTextColor" /> + </u:selector> </f:template> \ No newline at end of file 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-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-03-19 20:26:10 UTC (rev 13041) @@ -22,7 +22,7 @@ this.patternDec.compile("[^0-9]+"); this.charMin = 65; var o = this.options, self = this, - tpl = $(o.clientId.toString()+"-popup"); + tpl = $(o.clientId.toString()+"-colorPicker-popup"); if(o.color.indexOf('hsb') > -1){ this.color = this._fixHSB(this._fixColors(o.color, 'hsb')); @@ -41,7 +41,7 @@ this.showEvent = o.showEvent; this.origColor = this.color; this.picker = $(tpl); - + this.picker[0].component = this; this.fields = this.picker.find('input') .bind('keydown', function(e) { return self._keyDown.call(self, e); }) @@ -83,10 +83,10 @@ this.picker.css({ position: 'absolute' }); - this.picker.show(); $(this.element).bind(this.showEvent+".colorPicker", function(e) { return self._show.call(self, e); }); + self._show(); } else { - this.picker.hide(); + $(this.element).bind(this.showEvent+".colorPicker", function(e) { return self._show.call(self, e); }); } @@ -95,6 +95,7 @@ destroy: function() { this.picker.remove(); + this.picker[0].component = undefined; this.element.removeData("colorPicker").unbind(".colorPicker"); }, @@ -298,12 +299,12 @@ var RGBCol = this._HSBToRGB(col); this._trigger("submit", e, { options: this.options, hex: '#'+this._HSBToHex(col), rgb: 'rgb('+RGBCol.r+', '+RGBCol.g+', '+RGBCol.b+')' }); this.picker.hide(); - $(window).unbind('mousedown.colorPicker'); + $(document).unbind('mousedown.colorPicker'); return false; }, _clickCancel: function(e) { this.picker.hide(); - $(window).unbind('mousedown.colorPicker'); + $(document).unbind('mousedown.colorPicker'); return false; }, _show: function(e) { @@ -332,7 +333,7 @@ } var self = this; - $(window).bind('mousedown.colorPicker', function(e) { return self._hide.call(self, e); }); + $(document).bind('mousedown.colorPicker', function(e) { return self._hide.call(self, e); }); return false; }, @@ -375,7 +376,7 @@ if (parentEl == el) { return true; } - if (parentEl.contains && !$.browser.safari) { + if (parentEl.contains) { return parentEl.contains(el); } if ( parentEl.compareDocumentPosition ) { @@ -466,18 +467,14 @@ return this._RGBToHex(this._HSBToRGB(hsb)); }, setColor: function(col) { - if(o.color.indexOf('hsb') > -1){ - this.color = this._fixHSB(this._fixColors(o.color, 'hsb')); - - } else if(o.color.indexOf('rgb') > -1){ - this.color = this._RGBToHSB(this._fixColors(o.color, 'rgb')); - - } else if(o.color.indexOf('#') > -1){ - this.color = this._HexToHSB(o.color); - - } else{ + if (typeof col == 'string') { + col = this._HexToHSB(col); + } else if (col.r != undefined && col.g != undefined && col.b != undefined) { + col = this._RGBToHSB(col); + } else if (col.h != undefined && col.s != undefined && col.b != undefined) { + col = this._fixHSB(col); + } else { return this; - } this.color = col; Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js 2009-03-19 20:26:10 UTC (rev 13041) @@ -7,4 +7,4 @@ * * http://docs.jquery.com/UI */ -jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUM! PAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=... m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","no! ne").bind("selectstart.ui",function(){return false})},scrollParent:fun ction(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focus! able")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)! }}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData( p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for! (var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.c! ancel=="string"?c(l.target).parents().add(l.target).filter(this.option s.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseSt! arted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery); \ No newline at end of file +jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUM! PAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=... m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","no! ne").bind("selectstart.ui",function(){return false})},scrollParent:fun ction(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focus! able")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)! }}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData( p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for! (var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.c! ancel=="string"?c(l.target).parents().add(l.target).filter(this.option s.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari);l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return undefined;}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}retu! rn !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery); \ No newline at end of file Deleted: trunk/ui/colorPicker/src/main/templates/README =================================================================== Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx =================================================================== --- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-19 20:26:10 UTC (rev 13041) @@ -21,61 +21,10 @@ <c:object var="colorMode" type="java.lang.String" /> <c:object var="value" type="java.lang.String" /> - <div style="display: none;" id="#{clientId}-colorPickerScript"> - <script type="text/javascript"> - jQuery(document).ready(function(){ - - if(navigator.appName == "Microsoft Internet Explorer" &amp;&amp; parseInt(navigator.appVersion) == 4 &amp;&amp; navigator.appVersion.indexOf("MSIE 7.0") == -1){ - jQuery('div.rich-colorPicker-color').pngFix(); - } + <f:call name="addPopupToAjaxRendered" /> - <jsp:scriptlet><![CDATA[ - Boolean flat = (Boolean) component.getAttributes().get("flat"); - colorMode = (String) component.getAttributes().get("colorMode"); - showEvent = (String) component.getAttributes().get("showEvent"); - value = (String) component.getAttributes().get("value"); - - if (value == null || value == ""){ - value = "#ffffff"; - } - - if(showEvent.startsWith("on")){ - showEvent = showEvent.substring(2); - } - clientIdJquery = convertToString(clientId); - clientIdJquery = clientIdJquery.replace(":", "\\\\:"); - - colorMode = colorMode.toLowerCase(); - java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\\s+"); - colorMode = pattern.matcher(colorMode).replaceAll(""); - - boolean disabled = getUtils().isBooleanAttribute(component, "disabled"); - variables.setVariable("disabled",new Boolean(disabled)); - ]]></jsp:scriptlet> - - jQuery('\##{clientIdJquery}colorPicker').colorPicker({ - flat: #{component.attributes['flat']}, - color: "#{value}", - showEvent: "#{showEvent}", - clientId: '\##{clientIdJquery}colorPicker', - submit: function(e, ui) { - switch("#{colorMode}"){ - case "hex": - jQuery('\##{clientIdJquery}colorPicker input').val(ui.hex); - break; - case "rgb": - jQuery('\##{clientIdJquery}colorPicker input').val(ui.rgb); - break; - default: - jQuery('\##{clientIdJquery}colorPicker input').val(ui.hex); - } - } - }); - }); - </script> - </div> - <span id="#{clientId}colorPicker" class="rich-colorPicker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style"> - <input readonly="readonly" disabled="#{disabled}" type="text" name="#{clientId}" value="#{this:getInputValue(context, component)}"/> + <span id="#{clientId}" class="rich-colorPicker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style"> + <input readonly="readonly" type="text" name="#{clientId}" value="#{this:getInputValue(context, component)}"/> <jsp:scriptlet> <![CDATA[if(component.getFacet("icon")!=null && component.getFacet("icon").isRendered()) {]]> </jsp:scriptlet> @@ -93,7 +42,7 @@ </jsp:scriptlet> </span> -<div id="#{clientId}colorPicker-popup" class="rich-colorPicker-wrapper"> +<div id="#{clientId}-colorPicker-popup" class="rich-colorPicker-wrapper"> <div class="rich-colorPicker-ext"> <div class="rich-colorPicker-color"> <div> @@ -154,4 +103,58 @@ <button type="button" class="rich-colorPicker-cancel" name="cancel">Cancel</button> </div> </div> + <div style="display: none;" id="#{clientId}-colorPicker-script"> + <script type="text/javascript"> + + + if(navigator.appName == "Microsoft Internet Explorer" &amp;&amp; parseInt(navigator.appVersion) == 4 &amp;&amp; navigator.appVersion.indexOf("MSIE 7.0") == -1){ + jQuery('div.rich-colorPicker-color').pngFix(); + } + + <jsp:scriptlet><![CDATA[ + Boolean flat = (Boolean) component.getAttributes().get("flat"); + colorMode = (String) component.getAttributes().get("colorMode"); + showEvent = (String) component.getAttributes().get("showEvent"); + value = (String) component.getAttributes().get("value"); + + if (value == null || value == ""){ + value = "#ffffff"; + } + + if(showEvent.startsWith("on")){ + showEvent = showEvent.substring(2); + } + clientIdJquery = convertToString(clientId); + clientIdJquery = clientIdJquery.replace(":", "\\\\:"); + + colorMode = colorMode.toLowerCase(); + java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\\s+"); + colorMode = pattern.matcher(colorMode).replaceAll(""); + + boolean disabled = getUtils().isBooleanAttribute(component, "disabled"); + variables.setVariable("disabled",new Boolean(disabled)); + ]]></jsp:scriptlet> + + jQuery('\##{clientIdJquery}').colorPicker({ + flat: #{component.attributes['flat']}, + color: "#{value}", + showEvent: "#{showEvent}", + clientId: '\##{clientIdJquery}', + submit: function(e, ui) { + switch("#{colorMode}"){ + case "hex": + jQuery('\##{clientIdJquery} input').val(ui.hex); + break; + case "rgb": + jQuery('\##{clientIdJquery} input').val(ui.rgb); + break; + default: + jQuery('\##{clientIdJquery} input').val(ui.hex); + } + } + }); + + </script> + </div> + </f:root>