Author: nbelaevski Date: 2009-03-16 15:33:40 -0400 (Mon, 16 Mar 2009) New Revision: 12973 Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx Log: Color picker made compatible with bundled jQuery Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx =================================================================== --- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-16 18:30:56 UTC (rev 12972) +++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-16 19:33:40 UTC (rev 12973) @@ -22,10 +22,10 @@ <div style="display: none;" id="#{clientId}-colorPickerScript"> <script type="text/javascript"> - $(document).ready(function(){ + 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){ - $('div.rich-colorPicker-color').pngFix(); + jQuery('div.rich-colorPicker-color').pngFix(); } <jsp:scriptlet><![CDATA[ @@ -46,7 +46,7 @@ variables.setVariable("disabled",new Boolean(disabled)); ]]></jsp:scriptlet> - $('\##{clientIdJquery}colorPicker').colorPicker({ + jQuery('\##{clientIdJquery}colorPicker').colorPicker({ flat: #{component.attributes['flat']}, color: "#{component.attributes['value']}", showEvent: "#{showEvent}", @@ -54,13 +54,13 @@ submit: function(e, ui) { switch("#{colorMode}"){ case "hex": - $('\##{clientIdJquery}colorPicker input').val(ui.hex); + jQuery('\##{clientIdJquery}colorPicker input').val(ui.hex); break; case "rgb": - $('\##{clientIdJquery}colorPicker input').val(ui.rgb); + jQuery('\##{clientIdJquery}colorPicker input').val(ui.rgb); break; default: - $('\##{clientIdJquery}colorPicker input').val(ui.hex); + jQuery('\##{clientIdJquery}colorPicker input').val(ui.hex); } } });