[richfaces-svn-commits] JBoss Rich Faces SVN: r12322 - in trunk/sandbox/ui/colorPicker: src/main/templates/org/richfaces/ui and 1 other directory.
Author: artdaw
Date: 2009-01-16 19:54:31 -0500 (Fri, 16 Jan 2009)
New Revision: 12322
Modified:
trunk/sandbox/ui/colorPicker/pom.xml
trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx
Log:
rich:colorPicker fixed
Modified: trunk/sandbox/ui/colorPicker/pom.xml
===================================================================
--- trunk/sandbox/ui/colorPicker/pom.xml 2009-01-16 23:49:01 UTC (rev 12321)
+++ trunk/sandbox/ui/colorPicker/pom.xml 2009-01-17 00:54:31 UTC (rev 12322)
@@ -5,7 +5,7 @@
<version>3.3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.sandbox.ui</groupId>
<artifactId>colorPicker</artifactId>
<name>colorPicker</name>
<version>1.0-SNAPSHOT</version>
@@ -47,4 +47,4 @@
<version>3.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx
===================================================================
---
trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx 2009-01-16
23:49:01 UTC (rev 12321)
+++
trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx 2009-01-17
00:54:31 UTC (rev 12322)
@@ -23,11 +23,11 @@
<div style="display: none;"
id="#{clientId}-colorPickerScript">
<script type="text/javascript">
$(document).ready(function(){
- /*
+
if(navigator.appName == "Microsoft Internet Explorer" &&
parseInt(navigator.appVersion) == 4 &&
navigator.appVersion.indexOf("MSIE 7.0") == -1){
$('div.rich-colorPicker-color').pngFix();
}
- */
+
<jsp:scriptlet><![CDATA[
Boolean flat = (Boolean) component.getAttributes().get("flat");
String initColor = (String) component.getAttributes().get("initColor");
@@ -38,13 +38,13 @@
clientIdJquery = convertToString(clientId);
clientIdJquery = clientIdJquery.replace(":", "\\\\:");
]]></jsp:scriptlet>
- $('#{clientIdJquery}colorPicker').colorPicker({
- flat: "#{component.attributes['flat']}",
- color: "#{component.attributes['initColor']}",
- showEvent: "#{showEvent}",
- clientId: "#{clientIdJquery}colorPicker",
+ $('\##{clientIdJquery}colorPicker').colorPicker({
+ flat: #{component.attributes['flat']},
+ color: '#{component.attributes['initColor']}',
+ showEvent: '#{showEvent}',
+ clientId: '\##{clientIdJquery}colorPicker',
submit: function(e, ui) {
- $("#{clientIdJquery}colorPicker input").val(ui.hex);
+ $('\##{clientIdJquery}colorPicker input').val(ui.hex);
}
});
});