January 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r12322 - in trunk/sandbox/ui/colorPicker: src/main/templates/org/richfaces/ui and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

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); } }); });

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12321 - in trunk/sandbox/samples: colorPicker and 16 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-01-16 18:49:01 -0500 (Fri, 16 Jan 2009) New Revision: 12321 Added: trunk/sandbox/samples/colorPicker/ trunk/sandbox/samples/colorPicker/pom.xml trunk/sandbox/samples/colorPicker/src/ trunk/sandbox/samples/colorPicker/src/main/ trunk/sandbox/samples/colorPicker/src/main/java/ trunk/sandbox/samples/colorPicker/src/main/java/org/ trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/ trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/sandbox/ trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/sandbox/samples/ trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/sandbox/samples/Bean.java trunk/sandbox/samples/colorPicker/src/main/resources/ trunk/sandbox/samples/colorPicker/src/main/webapp/ trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/ trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/faces-config.xml trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/web.xml trunk/sandbox/samples/colorPicker/src/main/webapp/index.jsp trunk/sandbox/samples/colorPicker/src/main/webapp/pages/ trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.jsp trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.xhtml trunk/sandbox/samples/colorPicker/src/test/ trunk/sandbox/samples/colorPicker/src/test/java/ trunk/sandbox/samples/colorPicker/src/test/java/org/ trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/ trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/sandbox/ trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/sandbox/samples/ trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/sandbox/samples/BeanTest.java Log: rich:colorPicker sample Added: trunk/sandbox/samples/colorPicker/pom.xml =================================================================== --- trunk/sandbox/samples/colorPicker/pom.xml (rev 0) +++ trunk/sandbox/samples/colorPicker/pom.xml 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,48 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.3.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.sandbox.samples</groupId> + <artifactId>colorPicker</artifactId> + <packaging>war</packaging> + <name>colorPicker Maven Webapp</name> + <version>1.0-SNAPSHOT</version> + <build> + <finalName>colorPicker</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>colorPicker</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> Property changes on: trunk/sandbox/samples/colorPicker/pom.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/sandbox/samples/Bean.java =================================================================== --- trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/sandbox/samples/Bean.java (rev 0) +++ trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/sandbox/samples/Bean.java 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,44 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.sandbox.ui; +/** + * @author Gleb Galkin + * + */ + + +public class Bean { + + private String color = null; + + public Bean() { + + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } +} Property changes on: trunk/sandbox/samples/colorPicker/src/main/java/org/richfaces/sandbox/samples/Bean.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/faces-config.xml 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>bean</managed-bean-name> + <managed-bean-class>org.richfaces.sandbox.samples.Bean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> +</faces-config> Property changes on: trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/web.xml 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>Archetype Created Web Application</display-name> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> + <param-name>org.richfaces.SKIN</param-name> + <param-value>blueSky</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> + </context-param> +<context-param> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>NONE</param-value> +</context-param> + +  + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/sandbox/samples/colorPicker/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/samples/colorPicker/src/main/webapp/index.jsp =================================================================== --- trunk/sandbox/samples/colorPicker/src/main/webapp/index.jsp (rev 0) +++ trunk/sandbox/samples/colorPicker/src/main/webapp/index.jsp 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,11 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + +<head></head> + + <body> + <jsp:forward page="/pages/index.jsf" /> + </body> + +</html> \ No newline at end of file Property changes on: trunk/sandbox/samples/colorPicker/src/main/webapp/index.jsp ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.jsp (rev 0) +++ trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.jsp 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,188 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/colorPicker" prefix="colorPicker"%> +<html> + <head> + <title>ColorPicker sample page</title> +<style type="text/css"> + +.rich-colorPicker-wrapper{ + display:none; + font-family:Arial,Helvetica,sans-serif; + height:176px; + !height:166px; + overflow:hidden; + position:absolute; + width:350px; + margin-top: 2px; + !margin-top: -6px; + !margin-left: -2px; +} +.rich-colorPicker-ext{ + position: relative; + background-color: #ECF4FE; + border: 1px solid #BED6F8; + height: 170px; + padding: 0px; + margin: 0px; +} + +.rich-colorPicker-color { + background:#FF0000 none repeat scroll 0 0; + cursor:crosshair; + left:7px; + top:7px; + position:absolute; + overflow:hidden; + height:150px; + width:150px; + border: 1px solid #BED6F8; +} + +.rich-colorPicker-color div { + background:transparent url(images/colorpicker_overlay.png) repeat scroll 0 0; + left:0; + position:absolute; + top:0; + height:150px; + width:150px; +} + +.rich-colorPicker-color div div { + background:transparent url(images/colorpicker_select.gif) repeat scroll 0 0; + left:0; + top:0; + position:absolute; + margin:-6px 0 0 -6px; + overflow:hidden; + width:11px; + height:11px; +} + +.rich-colorPicker-rainbow{ + cursor:n-resize; + height:150px; + left:160px; + position:absolute; + top:7px; + width:35px; + text-align: center; +} +.rich-colorPicker-rainbow div{ + background:transparent url(images/rangearrows.gif) no-repeat scroll left top; + height:9px; + left:1px; + margin:-4px 0 0; + overflow:hidden; + position:absolute; + width:35px; +} + +.rich-colorPicker-new-color, .rich-colorPicker-current-color{ + position:absolute; + top:7px; + width: 60px; + height: 30px; + border: 1px solid #BED6F8; +} + +.rich-colorPicker-current-color{ + right:7px; + top:7px; +} + +.rich-colorPicker-new-color{ + left:198px; +} +.rich-colorPicker-hex-wrapper { + height:22px; + left:202px; + position:absolute; + top:119px; +} + +.rich-colorPicker-rgb-wrapper{ + left:184px; + position:absolute; + top:55px; + width:70px; + padding: 0px; + text-align: right; + margin-bottom: 2px +} + +.rich-colorPicker-hsb-wrapper{ + right:7px; + position:absolute; + top:55px; + width:70px; + padding: 0px; + text-align: right; + margin-bottom: 2px +} +.rich-colorPicker-hsb-h, .rich-colorPicker-rgb-r{ + top:45px; +} +.rich-colorPicker-hsb-s, .rich-colorPicker-rgb-g{ + top:70px; +} +.rich-colorPicker-hsb-b, .rich-colorPicker-rgb-b{ + top:95px; +} + + +.rich-colorPicker-rgb-wrapper label { + padding-top: 2px; + font-size: 16px; +} + +.rich-colorPicker-rgb-wrapper input, .rich-colorPicker-hex-wrapper input, .rich-colorPicker-hsb-wrapper input{ + width: 35px; + background-color: #fff; + border: 1px solid #BED6F8; + color: #000; + font-family: Arial,Verdana,sans-serif; + font-size: 16px; +} + +.rich-colorPicker-hex-wrapper input{ + width:60px; + font-size: 13px; +} + +.rich-colorPicker-submit, .rich-colorPicker-cancel{ + position:absolute; +right:75px; +top:144px; + border: 1px solid #BED6F8; +} +.rich-colorPicker-cancel{ +right:7px; +} +.rich-colorPicker-span input{ + border: 1px solid #BED6F8; + font-size: 12px; + width:130px; + vertical-align:middle; +} +.rich-colorPicker-icon { + display:inline; + cursor:pointer; + height:16px; + width:16px; + vertical-align:middle; + border: 1px solid #BED6F8; +} + +</style> + + </head> + <body> + <f:view> + <h:form> + <colorPicker:colorPicker value="#{bean.color}" flat="false" initColor="#f0f0f0"/> + <h:commandButton value="Submit" /> + </h:form> + </f:view> + </body> +</html> Property changes on: trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.jsp ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.xhtml =================================================================== --- trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.xhtml (rev 0) +++ trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.xhtml 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:c="http://java.sun.com/jsp/jstl/core" + > + <f:view> + + </f:view> +</html> \ No newline at end of file Property changes on: trunk/sandbox/samples/colorPicker/src/main/webapp/pages/index.xhtml ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/sandbox/samples/BeanTest.java =================================================================== --- trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/sandbox/samples/BeanTest.java (rev 0) +++ trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/sandbox/samples/BeanTest.java 2009-01-16 23:49:01 UTC (rev 12321) @@ -0,0 +1,46 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.sandbox.samples; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** +*/ +public class BeanTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public BeanTest( String testName ) + { + super( testName ); + } + + public void testStub() throws Exception { + + } +} Property changes on: trunk/sandbox/samples/colorPicker/src/test/java/org/richfaces/sandbox/samples/BeanTest.java ___________________________________________________________________ Name: svn:executable + *

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12320 - in trunk/sandbox/ui/colorPicker/src/main: config/component and 17 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-01-16 18:11:57 -0500 (Fri, 16 Jan 2009) New Revision: 12320 Added: trunk/sandbox/ui/colorPicker/src/main/config/component/colorPicker.xml trunk/sandbox/ui/colorPicker/src/main/config/resources/ trunk/sandbox/ui/colorPicker/src/main/config/resources/resource-config.xml trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/component/UIColorPicker.java trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/renderkit/ trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/renderkit/ColorPickerRendererBase.java trunk/sandbox/ui/colorPicker/src/main/resources/org/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/css/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/css/colorPicker.xcss trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/arrow.gif trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/colorpicker_overlay.png trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/colorpicker_select.gif trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/rainbow.png trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/rangearrows.gif trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/jquery-1.2.6.js trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/pngFix.js trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.colorpicker.js trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.core.js trunk/sandbox/ui/colorPicker/src/main/templates/org/ trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/ trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx Log: rich:colorPicker was implemented Added: trunk/sandbox/ui/colorPicker/src/main/config/component/colorPicker.xml =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/config/component/colorPicker.xml (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/config/component/colorPicker.xml 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> +<components> + <component> + <name>org.richfaces.ui.ColorPicker</name> + <family>org.richfaces.ui.ColorPicker</family> + <classname>org.richfaces.ui.component.html.HtmlColorPicker</classname> + <superclass>org.richfaces.ui.component.UIColorPicker</superclass> + <description> + <![CDATA[ + ]]> + </description> + <renderer generate="true" override="true"> + <name>org.richfaces.ui.ColorPickerRenderer</name> + <template>org/richfaces/ui/htmlColorPicker.jspx</template> + </renderer> + <tag> + <name>colorPicker</name> + <classname>org.richfaces.ui.taglib.ColorPickerTag</classname> + <superclass> + org.ajax4jsf.webapp.taglib.HtmlComponentTagBase + </superclass> + </tag> + <property> + <name>value</name> + <classname>java.lang.Object</classname> + <description> + The value of the component + </description> + </property> + + + <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>initColor</name> + <classname>java.lang.String</classname> + <description> + Defines initial color for the component. + You can use hex, RGB or HSB values. + </description> + <defaultvalue><![CDATA["#ffffff"]]></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.Object</classname> + <description> + The value of the component + </description> + </property> + &ui_component_attributes; + &html_events; + &ui_input_attributes; + </component> +</components> Property changes on: trunk/sandbox/ui/colorPicker/src/main/config/component/colorPicker.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/config/resources/resource-config.xml =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/config/resources/resource-config.xml (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/config/resources/resource-config.xml 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resource-config> + <resource> + <name>/org/richfaces/ui/renderkit/html/images/arrow.gif</name> + <path>/org/richfaces/ui/renderkit/html/images/arrow.gif</path> + </resource> + <resource> + <name>/org/richfaces/ui/renderkit/html/images/colorpicker_overlay.png</name> + <path>/org/richfaces/ui/renderkit/html/images/colorpicker_overlay.png</path> + </resource> + <resource> + <name>/org/richfaces/ui/renderkit/html/images/colorpicker_select.gif</name> + <path>/org/richfaces/ui/renderkit/html/images/colorpicker_select.gif</path> + </resource> + <resource> + <name>/org/richfaces/ui/renderkit/html/images/rainbow.png</name> + <path>/org/richfaces/ui/renderkit/html/images/rainbow.png</path> + </resource> + <resource> + <name>/org/richfaces/ui/renderkit/html/images/rangearrows.gif</name> + <path>/org/richfaces/ui/renderkit/html/images/rangearrows.gif</path> + </resource> + <resource> + <name>/org/richfaces/ui/renderkit/html/css/colorPicker.xcss</name> + <path>/org/richfaces/ui/renderkit/html/css/colorPicker.xcss</path> + </resource> +</resource-config> \ No newline at end of file Property changes on: trunk/sandbox/ui/colorPicker/src/main/config/resources/resource-config.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/component/UIColorPicker.java =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/component/UIColorPicker.java (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/component/UIColorPicker.java 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,19 @@ +/** + * + */ + +package org.richfaces.ui.component; + +import javax.faces.component.UIInput; + +/** + * JSF component class + * + */ +public abstract class UIColorPicker extends UIInput { + + public static final String COMPONENT_TYPE = "org.richfaces.ui.ColorPicker"; + + public static final String COMPONENT_FAMILY = "org.richfaces.ui.ColorPicker"; + +} Property changes on: trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/component/UIColorPicker.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/renderkit/ColorPickerRendererBase.java =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/renderkit/ColorPickerRendererBase.java (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/renderkit/ColorPickerRendererBase.java 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,24 @@ +package org.richfaces.ui.renderkit; + +import java.io.IOException; +import java.util.Map; +import javax.faces.component.UIComponent; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.richfaces.ui.component.UIColorPicker; + +public abstract class ColorPickerRendererBase extends HeaderResourcesRendererBase{ + + public void decode(FacesContext context, UIComponent component){ + ExternalContext external = context.getExternalContext(); + Map requestParams = external.getRequestParameterMap(); + UIColorPicker colorPicker = (UIColorPicker)component; + String clientId = colorPicker.getClientId(context); + String submittedValue = (String)requestParams.get(clientId); + + if (submittedValue != null) { + colorPicker.setSubmittedValue(submittedValue); + } + } +} \ No newline at end of file Property changes on: trunk/sandbox/ui/colorPicker/src/main/java/org/richfaces/ui/renderkit/ColorPickerRendererBase.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/css/colorPicker.xcss =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/css/colorPicker.xcss (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/css/colorPicker.xcss 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml" > + <f:verbatim> + <![CDATA[ +.rich-colorPicker-wrapper{ + display:none; + font-family:Arial,Helvetica,sans-serif; + height:176px; + !height:166px; + overflow:hidden; + position:absolute; + width:350px; + margin-top: 2px; + !margin-top: -6px; + !margin-left: -2px; +} +.rich-colorPicker-ext{ + position: relative; + background-color: #ECF4FE; + border: 1px solid #BED6F8; + height: 170px; + padding: 0px; + margin: 0px; +} + +.rich-colorPicker-color { + background:#FF0000 none repeat scroll 0 0; + cursor:crosshair; + left:7px; + top:7px; + position:absolute; + overflow:hidden; + height:150px; + width:150px; + border: 1px solid #BED6F8; +} + +.rich-colorPicker-color div { +/* background:transparent url(images/colorpicker_overlay.png) repeat scroll 0 0;*/ + left:0; + position:absolute; + top:0; + height:150px; + width:150px; +} + +.rich-colorPicker-color div div { +/* background:transparent url(images/colorpicker_select.gif) repeat scroll 0 0;*/ + left:0; + top:0; + position:absolute; + margin:-6px 0 0 -6px; + overflow:hidden; + width:11px; + height:11px; +} + +.rich-colorPicker-rainbow{ + cursor:n-resize; + height:150px; + left:160px; + position:absolute; + top:7px; + width:35px; + text-align: center; +} +.rich-colorPicker-rainbow div{ +/* background:transparent url(images/rangearrows.gif) no-repeat scroll left top; */ + height:9px; + left:1px; + margin:-4px 0 0; + overflow:hidden; + position:absolute; + width:35px; +} + +.rich-colorPicker-new-color, .rich-colorPicker-current-color{ + position:absolute; + top:7px; + width: 60px; + height: 30px; + border: 1px solid #BED6F8; +} + +.rich-colorPicker-current-color{ + right:7px; + top:7px; +} + +.rich-colorPicker-new-color{ + left:198px; +} +.rich-colorPicker-hex-wrapper { + height:22px; + left:202px; + position:absolute; + top:119px; +} + +.rich-colorPicker-rgb-wrapper{ + left:184px; + position:absolute; + top:55px; + width:70px; + padding: 0px; + text-align: right; + margin-bottom: 2px +} + +.rich-colorPicker-hsb-wrapper{ + right:7px; + position:absolute; + top:55px; + width:70px; + padding: 0px; + text-align: right; + margin-bottom: 2px +} +.rich-colorPicker-hsb-h, .rich-colorPicker-rgb-r{ + top:45px; +} +.rich-colorPicker-hsb-s, .rich-colorPicker-rgb-g{ + top:70px; +} +.rich-colorPicker-hsb-b, .rich-colorPicker-rgb-b{ + top:95px; +} + + +.rich-colorPicker-rgb-wrapper label { + padding-top: 2px; + font-size: 16px; +} + +.rich-colorPicker-rgb-wrapper input, .rich-colorPicker-hex-wrapper input, .rich-colorPicker-hsb-wrapper input{ + width: 35px; + background-color: #fff; + border: 1px solid #BED6F8; + color: #000; + font-family: Arial,Verdana,sans-serif; + font-size: 16px; +} + +.rich-colorPicker-hex-wrapper input{ + width:60px; + font-size: 13px; +} + +.rich-colorPicker-submit, .rich-colorPicker-cancel{ + position:absolute; +right:75px; +top:144px; + border: 1px solid #BED6F8; +} +.rich-colorPicker-cancel{ +right:7px; +} +.rich-colorPicker-span input{ + border: 1px solid #BED6F8; + font-size: 12px; + width:130px; + vertical-align:middle; +} +.rich-colorPicker-icon { + display:inline; + cursor:pointer; + height:16px; + width:16px; + vertical-align:middle; + border: 1px solid #BED6F8; +} + ]]> + </f:verbatim> + + <u:selector name=".rich-colorPicker-color div"> + <u:style name="background-image"> + <f:resource f:key="org/richfaces/ui/renderkit/html/images/colorpicker_overlay.png" /> + </u:style> + </u:selector> + + <u:selector name=".rich-colorPicker-color div div"> + <u:style name="background-image"> + <f:resource f:key="org/richfaces/ui/renderkit/html/images/colorpicker_select.gif" /> + </u:style> + </u:selector> + + <u:selector name=".rich-colorPicker-rainbow div"> + <u:style name="background-image"> + <f:resource f:key="org/richfaces/ui/renderkit/html/images/rangearrows.gif" /> + </u:style> + </u:selector> + +  + +</f:template> \ No newline at end of file Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/css/colorPicker.xcss ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/arrow.gif =================================================================== (Binary files differ) Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/arrow.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/colorpicker_overlay.png =================================================================== (Binary files differ) Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/colorpicker_overlay.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/colorpicker_select.gif =================================================================== (Binary files differ) Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/colorpicker_select.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/rainbow.png =================================================================== (Binary files differ) Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/rainbow.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/rangearrows.gif =================================================================== (Binary files differ) Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/images/rangearrows.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/jquery-1.2.6.js =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/jquery-1.2.6.js (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/jquery-1.2.6.js 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,3549 @@ +(function(){ +/* + * jQuery 1.2.6 - New Wave Javascript + * + * Copyright (c) 2008 John Resig (jquery.com) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $ + * $Rev: 5685 $ + */ + +// Map over jQuery in case of overwrite +var _jQuery = window.jQuery, +// Map over the $ in case of overwrite + _$ = window.$; + +var jQuery = window.jQuery = window.$ = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context ); +}; + +// A simple way to check for HTML strings or ID strings +// (both of which we optimize for) +var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/, + +// Is it a simple selector + isSimple = /^.[^:#\[\.]*$/, + +// Will speed up references to undefined, and allows munging its name. + undefined; + +jQuery.fn = jQuery.prototype = { + init: function( selector, context ) { + // Make sure that a selection was provided + selector = selector || document; + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this[0] = selector; + this.length = 1; + return this; + } + // Handle HTML strings + if ( typeof selector == "string" ) { + // Are we dealing with HTML string or an ID? + var match = quickExpr.exec( selector ); + + // Verify a match, and that no context was specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) + selector = jQuery.clean( [ match[1] ], context ); + + // HANDLE: $("#id") + else { + var elem = document.getElementById( match[3] ); + + // Make sure an element was located + if ( elem ){ + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id != match[3] ) + return jQuery().find( selector ); + + // Otherwise, we inject the element directly into the jQuery object + return jQuery( elem ); + } + selector = []; + } + + // HANDLE: $(expr, [context]) + // (which is just equivalent to: $(content).find(expr) + } else + return jQuery( context ).find( selector ); + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) + return jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector ); + + return this.setArray(jQuery.makeArray(selector)); + }, + + // The current version of jQuery being used + jquery: "1.2.6", + + // The number of elements contained in the matched element set + size: function() { + return this.length; + }, + + // The number of elements contained in the matched element set + length: 0, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num == undefined ? + + // Return a 'clean' array + jQuery.makeArray( this ) : + + // Return just the object + this[ num ]; + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + // Build a new jQuery matched element set + var ret = jQuery( elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + // Return the newly-formed element set + return ret; + }, + + // Force the current matched set of elements to become + // the specified array of elements (destroying the stack in the process) + // You should use pushStack() in order to do this, but maintain the stack + setArray: function( elems ) { + // Resetting the length to 0, then using the native Array push + // is a super-fast way to populate an object with array-like properties + this.length = 0; + Array.prototype.push.apply( this, elems ); + + return this; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + var ret = -1; + + // Locate the position of the desired element + return jQuery.inArray( + // If it receives a jQuery object, the first element is used + elem && elem.jquery ? elem[0] : elem + , this ); + }, + + attr: function( name, value, type ) { + var options = name; + + // Look for the case where we're accessing a style value + if ( name.constructor == String ) + if ( value === undefined ) + return this[0] && jQuery[ type || "attr" ]( this[0], name ); + + else { + options = {}; + options[ name ] = value; + } + + // Check to see if we're setting style values + return this.each(function(i){ + // Set all the styles + for ( name in options ) + jQuery.attr( + type ? + this.style : + this, + name, jQuery.prop( this, options[ name ], type, i, name ) + ); + }); + }, + + css: function( key, value ) { + // ignore negative width and height values + if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) + value = undefined; + return this.attr( key, value, "curCSS" ); + }, + + text: function( text ) { + if ( typeof text != "object" && text != null ) + return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); + + var ret = ""; + + jQuery.each( text || this, function(){ + jQuery.each( this.childNodes, function(){ + if ( this.nodeType != 8 ) + ret += this.nodeType != 1 ? + this.nodeValue : + jQuery.fn.text( [ this ] ); + }); + }); + + return ret; + }, + + wrapAll: function( html ) { + if ( this[0] ) + // The elements to wrap the target around + jQuery( html, this[0].ownerDocument ) + .clone() + .insertBefore( this[0] ) + .map(function(){ + var elem = this; + + while ( elem.firstChild ) + elem = elem.firstChild; + + return elem; + }) + .append(this); + + return this; + }, + + wrapInner: function( html ) { + return this.each(function(){ + jQuery( this ).contents().wrapAll( html ); + }); + }, + + wrap: function( html ) { + return this.each(function(){ + jQuery( this ).wrapAll( html ); + }); + }, + + append: function() { + return this.domManip(arguments, true, false, function(elem){ + if (this.nodeType == 1) + this.appendChild( elem ); + }); + }, + + prepend: function() { + return this.domManip(arguments, true, true, function(elem){ + if (this.nodeType == 1) + this.insertBefore( elem, this.firstChild ); + }); + }, + + before: function() { + return this.domManip(arguments, false, false, function(elem){ + this.parentNode.insertBefore( elem, this ); + }); + }, + + after: function() { + return this.domManip(arguments, false, true, function(elem){ + this.parentNode.insertBefore( elem, this.nextSibling ); + }); + }, + + end: function() { + return this.prevObject || jQuery( [] ); + }, + + find: function( selector ) { + var elems = jQuery.map(this, function(elem){ + return jQuery.find( selector, elem ); + }); + + return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ? + jQuery.unique( elems ) : + elems ); + }, + + clone: function( events ) { + // Do the clone + var ret = this.map(function(){ + if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) { + // IE copies events bound via attachEvent when + // using cloneNode. Calling detachEvent on the + // clone will also remove the events from the orignal + // In order to get around this, we use innerHTML. + // Unfortunately, this means some modifications to + // attributes in IE that are actually only stored + // as properties will not be copied (such as the + // the name attribute on an input). + var clone = this.cloneNode(true), + container = document.createElement("div"); + container.appendChild(clone); + return jQuery.clean([container.innerHTML])[0]; + } else + return this.cloneNode(true); + }); + + // Need to set the expando to null on the cloned set if it exists + // removeData doesn't work here, IE removes it from the original as well + // this is primarily for IE but the data expando shouldn't be copied over in any browser + var clone = ret.find("*").andSelf().each(function(){ + if ( this[ expando ] != undefined ) + this[ expando ] = null; + }); + + // Copy the events from the original to the clone + if ( events === true ) + this.find("*").andSelf().each(function(i){ + if (this.nodeType == 3) + return; + var events = jQuery.data( this, "events" ); + + for ( var type in events ) + for ( var handler in events[ type ] ) + jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data ); + }); + + // Return the cloned set + return ret; + }, + + filter: function( selector ) { + return this.pushStack( + jQuery.isFunction( selector ) && + jQuery.grep(this, function(elem, i){ + return selector.call( elem, i ); + }) || + + jQuery.multiFilter( selector, this ) ); + }, + + not: function( selector ) { + if ( selector.constructor == String ) + // test special case where just one selector is passed in + if ( isSimple.test( selector ) ) + return this.pushStack( jQuery.multiFilter( selector, this, true ) ); + else + selector = jQuery.multiFilter( selector, this ); + + var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType; + return this.filter(function() { + return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector; + }); + }, + + add: function( selector ) { + return this.pushStack( jQuery.unique( jQuery.merge( + this.get(), + typeof selector == 'string' ? + jQuery( selector ) : + jQuery.makeArray( selector ) + ))); + }, + + is: function( selector ) { + return !!selector && jQuery.multiFilter( selector, this ).length > 0; + }, + + hasClass: function( selector ) { + return this.is( "." + selector ); + }, + + val: function( value ) { + if ( value == undefined ) { + + if ( this.length ) { + var elem = this[0]; + + // We need to handle select boxes special + if ( jQuery.nodeName( elem, "select" ) ) { + var index = elem.selectedIndex, + values = [], + options = elem.options, + one = elem.type == "select-one"; + + // Nothing was selected + if ( index < 0 ) + return null; + + // Loop through all the selected options + for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { + var option = options[ i ]; + + if ( option.selected ) { + // Get the specifc value for the option + value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value; + + // We don't need an array for one selects + if ( one ) + return value; + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + + // Everything else, we just grab the value + } else + return (this[0].value || "").replace(/\r/g, ""); + + } + + return undefined; + } + + if( value.constructor == Number ) + value += ''; + + return this.each(function(){ + if ( this.nodeType != 1 ) + return; + + if ( value.constructor == Array && /radio|checkbox/.test( this.type ) ) + this.checked = (jQuery.inArray(this.value, value) >= 0 || + jQuery.inArray(this.name, value) >= 0); + + else if ( jQuery.nodeName( this, "select" ) ) { + var values = jQuery.makeArray(value); + + jQuery( "option", this ).each(function(){ + this.selected = (jQuery.inArray( this.value, values ) >= 0 || + jQuery.inArray( this.text, values ) >= 0); + }); + + if ( !values.length ) + this.selectedIndex = -1; + + } else + this.value = value; + }); + }, + + html: function( value ) { + return value == undefined ? + (this[0] ? + this[0].innerHTML : + null) : + this.empty().append( value ); + }, + + replaceWith: function( value ) { + return this.after( value ).remove(); + }, + + eq: function( i ) { + return this.slice( i, i + 1 ); + }, + + slice: function() { + return this.pushStack( Array.prototype.slice.apply( this, arguments ) ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function(elem, i){ + return callback.call( elem, i, elem ); + })); + }, + + andSelf: function() { + return this.add( this.prevObject ); + }, + + data: function( key, value ){ + var parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value === undefined ) { + var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + if ( data === undefined && this.length ) + data = jQuery.data( this[0], key ); + + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; + } else + return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ + jQuery.data( this, key, value ); + }); + }, + + removeData: function( key ){ + return this.each(function(){ + jQuery.removeData( this, key ); + }); + }, + + domManip: function( args, table, reverse, callback ) { + var clone = this.length > 1, elems; + + return this.each(function(){ + if ( !elems ) { + elems = jQuery.clean( args, this.ownerDocument ); + + if ( reverse ) + elems.reverse(); + } + + var obj = this; + + if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) ) + obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") ); + + var scripts = jQuery( [] ); + + jQuery.each(elems, function(){ + var elem = clone ? + jQuery( this ).clone( true )[0] : + this; + + // execute all scripts after the elements have been injected + if ( jQuery.nodeName( elem, "script" ) ) + scripts = scripts.add( elem ); + else { + // Remove any inner scripts for later evaluation + if ( elem.nodeType == 1 ) + scripts = scripts.add( jQuery( "script", elem ).remove() ); + + // Inject the elements into the document + callback.call( obj, elem ); + } + }); + + scripts.each( evalScript ); + }); + } +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.fn.init.prototype = jQuery.fn; + +function evalScript( i, elem ) { + if ( elem.src ) + jQuery.ajax({ + url: elem.src, + async: false, + dataType: "script" + }); + + else + jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); + + if ( elem.parentNode ) + elem.parentNode.removeChild( elem ); +} + +function now(){ + return +new Date; +} + +jQuery.extend = jQuery.fn.extend = function() { + // copy reference to target object + var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options; + + // Handle a deep copy situation + if ( target.constructor == Boolean ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target != "object" && typeof target != "function" ) + target = {}; + + // extend jQuery itself if only one argument is passed + if ( length == i ) { + target = this; + --i; + } + + for ( ; i < length; i++ ) + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) + // Extend the base object + for ( var name in options ) { + var src = target[ name ], copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) + continue; + + // Recurse if we're merging object values + if ( deep && copy && typeof copy == "object" && !copy.nodeType ) + target[ name ] = jQuery.extend( deep, + // Never move original objects, clone them + src || ( copy.length != null ? [ ] : { } ) + , copy ); + + // Don't bring in undefined values + else if ( copy !== undefined ) + target[ name ] = copy; + + } + + // Return the modified object + return target; +}; + +var expando = "jQuery" + now(), uuid = 0, windowData = {}, + // exclude the following css properties to add px + exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, + // cache defaultView + defaultView = document.defaultView || {}; + +jQuery.extend({ + noConflict: function( deep ) { + window.$ = _$; + + if ( deep ) + window.jQuery = _jQuery; + + return jQuery; + }, + + // See test/unit/core.js for details concerning this function. + isFunction: function( fn ) { + return !!fn && typeof fn != "string" && !fn.nodeName && + fn.constructor != Array && /^[\s[]?function/.test( fn + "" ); + }, + + // check if an element is in a (or is an) XML document + isXMLDoc: function( elem ) { + return elem.documentElement && !elem.body || + elem.tagName && elem.ownerDocument && !elem.ownerDocument.body; + }, + + // Evalulates a script in a global context + globalEval: function( data ) { + data = jQuery.trim( data ); + + if ( data ) { + // Inspired by code by Andrea Giammarchi + // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom... + var head = document.getElementsByTagName("head")[0] || document.documentElement, + script = document.createElement("script"); + + script.type = "text/javascript"; + if ( jQuery.browser.msie ) + script.text = data; + else + script.appendChild( document.createTextNode( data ) ); + + // Use insertBefore instead of appendChild to circumvent an IE6 bug. + // This arises when a base node is used (#2709). + head.insertBefore( script, head.firstChild ); + head.removeChild( script ); + } + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); + }, + + cache: {}, + + data: function( elem, name, data ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ]; + + // Compute a unique ID for the element + if ( !id ) + id = elem[ expando ] = ++uuid; + + // Only generate the data cache if we're + // trying to access or manipulate it + if ( name && !jQuery.cache[ id ] ) + jQuery.cache[ id ] = {}; + + // Prevent overriding the named cache with undefined values + if ( data !== undefined ) + jQuery.cache[ id ][ name ] = data; + + // Return the named cache data, or the ID for the element + return name ? + jQuery.cache[ id ][ name ] : + id; + }, + + removeData: function( elem, name ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ]; + + // If we want to remove a specific section of the element's data + if ( name ) { + if ( jQuery.cache[ id ] ) { + // Remove the section of cache data + delete jQuery.cache[ id ][ name ]; + + // If we've removed all the data, remove the element's cache + name = ""; + + for ( name in jQuery.cache[ id ] ) + break; + + if ( !name ) + jQuery.removeData( elem ); + } + + // Otherwise, we want to remove all of the element's data + } else { + // Clean up the element expando + try { + delete elem[ expando ]; + } catch(e){ + // IE has trouble directly removing the expando + // but it's ok with using removeAttribute + if ( elem.removeAttribute ) + elem.removeAttribute( expando ); + } + + // Completely remove the data cache + delete jQuery.cache[ id ]; + } + }, + + // args is for internal usage only + each: function( object, callback, args ) { + var name, i = 0, length = object.length; + + if ( args ) { + if ( length == undefined ) { + for ( name in object ) + if ( callback.apply( object[ name ], args ) === false ) + break; + } else + for ( ; i < length; ) + if ( callback.apply( object[ i++ ], args ) === false ) + break; + + // A special, fast, case for the most common use of each + } else { + if ( length == undefined ) { + for ( name in object ) + if ( callback.call( object[ name ], name, object[ name ] ) === false ) + break; + } else + for ( var value = object[0]; + i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} + } + + return object; + }, + + prop: function( elem, value, type, i, name ) { + // Handle executable functions + if ( jQuery.isFunction( value ) ) + value = value.call( elem, i ); + + // Handle passing in a number to a CSS property + return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ? + value + "px" : + value; + }, + + className: { + // internal only, use addClass("class") + add: function( elem, classNames ) { + jQuery.each((classNames || "").split(/\s+/), function(i, className){ + if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) ) + elem.className += (elem.className ? " " : "") + className; + }); + }, + + // internal only, use removeClass("class") + remove: function( elem, classNames ) { + if (elem.nodeType == 1) + elem.className = classNames != undefined ? + jQuery.grep(elem.className.split(/\s+/), function(className){ + return !jQuery.className.has( classNames, className ); + }).join(" ") : + ""; + }, + + // internal only, use hasClass("class") + has: function( elem, className ) { + return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1; + } + }, + + // A method for quickly swapping in/out CSS properties to get correct calculations + swap: function( elem, options, callback ) { + var old = {}; + // Remember the old values, and insert the new ones + for ( var name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } + + callback.call( elem ); + + // Revert the old values + for ( var name in options ) + elem.style[ name ] = old[ name ]; + }, + + css: function( elem, name, force ) { + if ( name == "width" || name == "height" ) { + var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; + + function getWH() { + val = name == "width" ? elem.offsetWidth : elem.offsetHeight; + var padding = 0, border = 0; + jQuery.each( which, function() { + padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; + border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; + }); + val -= Math.round(padding + border); + } + + if ( jQuery(elem).is(":visible") ) + getWH(); + else + jQuery.swap( elem, props, getWH ); + + return Math.max(0, val); + } + + return jQuery.curCSS( elem, name, force ); + }, + + curCSS: function( elem, name, force ) { + var ret, style = elem.style; + + // A helper method for determining if an element's values are broken + function color( elem ) { + if ( !jQuery.browser.safari ) + return false; + + // defaultView is cached + var ret = defaultView.getComputedStyle( elem, null ); + return !ret || ret.getPropertyValue("color") == ""; + } + + // We need to handle opacity special in IE + if ( name == "opacity" && jQuery.browser.msie ) { + ret = jQuery.attr( style, "opacity" ); + + return ret == "" ? + "1" : + ret; + } + // Opera sometimes will give the wrong display answer, this fixes it, see #2037 + if ( jQuery.browser.opera && name == "display" ) { + var save = style.outline; + style.outline = "0 solid black"; + style.outline = save; + } + + // Make sure we're using the right name for getting the float value + if ( name.match( /float/i ) ) + name = styleFloat; + + if ( !force && style && style[ name ] ) + ret = style[ name ]; + + else if ( defaultView.getComputedStyle ) { + + // Only "float" is needed here + if ( name.match( /float/i ) ) + name = "float"; + + name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); + + var computedStyle = defaultView.getComputedStyle( elem, null ); + + if ( computedStyle && !color( elem ) ) + ret = computedStyle.getPropertyValue( name ); + + // If the element isn't reporting its values properly in Safari + // then some display: none elements are involved + else { + var swap = [], stack = [], a = elem, i = 0; + + // Locate all of the parent display: none elements + for ( ; a && color(a); a = a.parentNode ) + stack.unshift(a); + + // Go through and make them visible, but in reverse + // (It would be better if we knew the exact display type that they had) + for ( ; i < stack.length; i++ ) + if ( color( stack[ i ] ) ) { + swap[ i ] = stack[ i ].style.display; + stack[ i ].style.display = "block"; + } + + // Since we flip the display style, we have to handle that + // one special, otherwise get the value + ret = name == "display" && swap[ stack.length - 1 ] != null ? + "none" : + ( computedStyle && computedStyle.getPropertyValue( name ) ) || ""; + + // Finally, revert the display styles back + for ( i = 0; i < swap.length; i++ ) + if ( swap[ i ] != null ) + stack[ i ].style.display = swap[ i ]; + } + + // We should always get a number back from opacity + if ( name == "opacity" && ret == "" ) + ret = "1"; + + } else if ( elem.currentStyle ) { + var camelCase = name.replace(/\-(\w)/g, function(all, letter){ + return letter.toUpperCase(); + }); + + ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; + + // From the awesome hack by Dean Edwards + // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + + // If we're not dealing with a regular pixel number + // but a number that has a weird ending, we need to convert it to pixels + if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { + // Remember the original values + var left = style.left, rsLeft = elem.runtimeStyle.left; + + // Put in the new values to get a computed value out + elem.runtimeStyle.left = elem.currentStyle.left; + style.left = ret || 0; + ret = style.pixelLeft + "px"; + + // Revert the changed values + style.left = left; + elem.runtimeStyle.left = rsLeft; + } + } + + return ret; + }, + + clean: function( elems, context ) { + var ret = []; + context = context || document; + // !context.createElement fails in IE with an error but returns typeof 'object' + if (typeof context.createElement == 'undefined') + context = context.ownerDocument || context[0] && context[0].ownerDocument || document; + + jQuery.each(elems, function(i, elem){ + if ( !elem ) + return; + + if ( elem.constructor == Number ) + elem += ''; + + // Convert html string into DOM nodes + if ( typeof elem == "string" ) { + // Fix "XHTML"-style tags in all browsers + elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){ + return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ? + all : + front + "></" + tag + ">"; + }); + + // Trim whitespace, otherwise indexOf won't work as expected + var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div"); + + var wrap = + // option or optgroup + !tags.indexOf("<opt") && + [ 1, "<select multiple='multiple'>", "</select>" ] || + + !tags.indexOf("<leg") && + [ 1, "<fieldset>", "</fieldset>" ] || + + tags.match(/^<(thead|tbody|tfoot|colg|cap)/) && + [ 1, "<table>", "</table>" ] || + + !tags.indexOf("<tr") && + [ 2, "<table><tbody>", "</tbody></table>" ] || + + // <thead> matched above + (!tags.indexOf("<td") || !tags.indexOf("<th")) && + [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] || + + !tags.indexOf("<col") && + [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] || + + // IE can't serialize <link> and <script> tags normally + jQuery.browser.msie && + [ 1, "div<div>", "</div>" ] || + + [ 0, "", "" ]; + + // Go to html and back, then peel off extra wrappers + div.innerHTML = wrap[1] + elem + wrap[2]; + + // Move to the right depth + while ( wrap[0]-- ) + div = div.lastChild; + + // Remove IE's autoinserted <tbody> from table fragments + if ( jQuery.browser.msie ) { + + // String was a <table>, *may* have spurious <tbody> + var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ? + div.firstChild && div.firstChild.childNodes : + + // String was a bare <thead> or <tfoot> + wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ? + div.childNodes : + []; + + for ( var j = tbody.length - 1; j >= 0 ; --j ) + if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) + tbody[ j ].parentNode.removeChild( tbody[ j ] ); + + // IE completely kills leading whitespace when innerHTML is used + if ( /^\s/.test( elem ) ) + div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild ); + + } + + elem = jQuery.makeArray( div.childNodes ); + } + + if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) ) + return; + + if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options ) + ret.push( elem ); + + else + ret = jQuery.merge( ret, elem ); + + }); + + return ret; + }, + + attr: function( elem, name, value ) { + // don't set attributes on text and comment nodes + if (!elem || elem.nodeType == 3 || elem.nodeType == 8) + return undefined; + + var notxml = !jQuery.isXMLDoc( elem ), + // Whether we are setting (or getting) + set = value !== undefined, + msie = jQuery.browser.msie; + + // Try to normalize/fix the name + name = notxml && jQuery.props[ name ] || name; + + // Only do all the following if this is a node (faster for style) + // IE elem.getAttribute passes even for style + if ( elem.tagName ) { + + // These attributes require special treatment + var special = /href|src|style/.test( name ); + + // Safari mis-reports the default selected property of a hidden option + // Accessing the parent's selectedIndex property fixes it + if ( name == "selected" && jQuery.browser.safari ) + elem.parentNode.selectedIndex; + + // If applicable, access the attribute via the DOM 0 way + if ( name in elem && notxml && !special ) { + if ( set ){ + // We can't allow the type property to be changed (since it causes problems in IE) + if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode ) + throw "type property can't be changed"; + + elem[ name ] = value; + } + + // browsers index elements by id/name on forms, give priority to attributes. + if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) + return elem.getAttributeNode( name ).nodeValue; + + return elem[ name ]; + } + + if ( msie && notxml && name == "style" ) + return jQuery.attr( elem.style, "cssText", value ); + + if ( set ) + // convert the value to a string (all browsers do this but IE) see #1070 + elem.setAttribute( name, "" + value ); + + var attr = msie && notxml && special + // Some attributes require a special call on IE + ? elem.getAttribute( name, 2 ) + : elem.getAttribute( name ); + + // Non-existent attributes return null, we normalize to undefined + return attr === null ? undefined : attr; + } + + // elem is actually elem.style ... set the style + + // IE uses filters for opacity + if ( msie && name == "opacity" ) { + if ( set ) { + // IE has trouble with opacity if it does not have layout + // Force it by setting the zoom level + elem.zoom = 1; + + // Set the alpha filter to set the opacity + elem.filter = (elem.filter || "").replace( /alpha$[^)]*$/, "" ) + + (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); + } + + return elem.filter && elem.filter.indexOf("opacity=") >= 0 ? + (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '': + ""; + } + + name = name.replace(/-([a-z])/ig, function(all, letter){ + return letter.toUpperCase(); + }); + + if ( set ) + elem[ name ] = value; + + return elem[ name ]; + }, + + trim: function( text ) { + return (text || "").replace( /^\s+|\s+$/g, "" ); + }, + + makeArray: function( array ) { + var ret = []; + + if( array != null ){ + var i = array.length; + //the window, strings and functions also have 'length' + if( i == null || array.split || array.setInterval || array.call ) + ret[0] = array; + else + while( i ) + ret[--i] = array[i]; + } + + return ret; + }, + + inArray: function( elem, array ) { + for ( var i = 0, length = array.length; i < length; i++ ) + // Use === because on IE, window == document + if ( array[ i ] === elem ) + return i; + + return -1; + }, + + merge: function( first, second ) { + // We have to loop this way because IE & Opera overwrite the length + // expando of getElementsByTagName + var i = 0, elem, pos = first.length; + // Also, we need to make sure that the correct elements are being returned + // (IE returns comment nodes in a '*' query) + if ( jQuery.browser.msie ) { + while ( elem = second[ i++ ] ) + if ( elem.nodeType != 8 ) + first[ pos++ ] = elem; + + } else + while ( elem = second[ i++ ] ) + first[ pos++ ] = elem; + + return first; + }, + + unique: function( array ) { + var ret = [], done = {}; + + try { + + for ( var i = 0, length = array.length; i < length; i++ ) { + var id = jQuery.data( array[ i ] ); + + if ( !done[ id ] ) { + done[ id ] = true; + ret.push( array[ i ] ); + } + } + + } catch( e ) { + ret = array; + } + + return ret; + }, + + grep: function( elems, callback, inv ) { + var ret = []; + + // Go through the array, only saving the items + // that pass the validator function + for ( var i = 0, length = elems.length; i < length; i++ ) + if ( !inv != !callback( elems[ i ], i ) ) + ret.push( elems[ i ] ); + + return ret; + }, + + map: function( elems, callback ) { + var ret = []; + + // Go through the array, translating each of the items to their + // new value (or values). + for ( var i = 0, length = elems.length; i < length; i++ ) { + var value = callback( elems[ i ], i ); + + if ( value != null ) + ret[ ret.length ] = value; + } + + return ret.concat.apply( [], ret ); + } +}); + +var userAgent = navigator.userAgent.toLowerCase(); + +// Figure out what browser is being used +jQuery.browser = { + version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1], + safari: /webkit/.test( userAgent ), + opera: /opera/.test( userAgent ), + msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ), + mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent ) +}; + +var styleFloat = jQuery.browser.msie ? + "styleFloat" : + "cssFloat"; + +jQuery.extend({ + // Check to see if the W3C box model is being used + boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat", + + props: { + "for": "htmlFor", + "class": "className", + "float": styleFloat, + cssFloat: styleFloat, + styleFloat: styleFloat, + readonly: "readOnly", + maxlength: "maxLength", + cellspacing: "cellSpacing" + } +}); + +jQuery.each({ + parent: function(elem){return elem.parentNode;}, + parents: function(elem){return jQuery.dir(elem,"parentNode");}, + next: function(elem){return jQuery.nth(elem,2,"nextSibling");}, + prev: function(elem){return jQuery.nth(elem,2,"previousSibling");}, + nextAll: function(elem){return jQuery.dir(elem,"nextSibling");}, + prevAll: function(elem){return jQuery.dir(elem,"previousSibling");}, + siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);}, + children: function(elem){return jQuery.sibling(elem.firstChild);}, + contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);} +}, function(name, fn){ + jQuery.fn[ name ] = function( selector ) { + var ret = jQuery.map( this, fn ); + + if ( selector && typeof selector == "string" ) + ret = jQuery.multiFilter( selector, ret ); + + return this.pushStack( jQuery.unique( ret ) ); + }; +}); + +jQuery.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function(name, original){ + jQuery.fn[ name ] = function() { + var args = arguments; + + return this.each(function(){ + for ( var i = 0, length = args.length; i < length; i++ ) + jQuery( args[ i ] )[ original ]( this ); + }); + }; +}); + +jQuery.each({ + removeAttr: function( name ) { + jQuery.attr( this, name, "" ); + if (this.nodeType == 1) + this.removeAttribute( name ); + }, + + addClass: function( classNames ) { + jQuery.className.add( this, classNames ); + }, + + removeClass: function( classNames ) { + jQuery.className.remove( this, classNames ); + }, + + toggleClass: function( classNames ) { + jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames ); + }, + + remove: function( selector ) { + if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) { + // Prevent memory leaks + jQuery( "*", this ).add(this).each(function(){ + jQuery.event.remove(this); + jQuery.removeData(this); + }); + if (this.parentNode) + this.parentNode.removeChild( this ); + } + }, + + empty: function() { + // Remove element nodes and prevent memory leaks + jQuery( ">*", this ).remove(); + + // Remove any remaining nodes + while ( this.firstChild ) + this.removeChild( this.firstChild ); + } +}, function(name, fn){ + jQuery.fn[ name ] = function(){ + return this.each( fn, arguments ); + }; +}); + +jQuery.each([ "Height", "Width" ], function(i, name){ + var type = name.toLowerCase(); + + jQuery.fn[ type ] = function( size ) { + // Get window width or height + return this[0] == window ? + // Opera reports document.body.client[Width/Height] properly in both quirks and standards + jQuery.browser.opera && document.body[ "client" + name ] || + + // Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths) + jQuery.browser.safari && window[ "inner" + name ] || + + // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode + document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] : + + // Get document width or height + this[0] == document ? + // Either scroll[Width/Height] or offset[Width/Height], whichever is greater + Math.max( + Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]), + Math.max(document.body["offset" + name], document.documentElement["offset" + name]) + ) : + + // Get or set width or height on the element + size == undefined ? + // Get width or height on the element + (this.length ? jQuery.css( this[0], type ) : null) : + + // Set the width or height on the element (default to pixels if value is unitless) + this.css( type, size.constructor == String ? size : size + "px" ); + }; +}); + +// Helper function used by the dimensions and offset modules +function num(elem, prop) { + return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0; +}var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ? + "(?:[\\w*_-]|\\\\.)" : + "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)", + quickChild = new RegExp("^>\\s*(" + chars + "+)"), + quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"), + quickClass = new RegExp("^([#.]?)(" + chars + "*)"); + +jQuery.extend({ + expr: { + "": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);}, + "#": function(a,i,m){return a.getAttribute("id")==m[2];}, + ":": { + // Position Checks + lt: function(a,i,m){return i<m[3]-0;}, + gt: function(a,i,m){return i>m[3]-0;}, + nth: function(a,i,m){return m[3]-0==i;}, + eq: function(a,i,m){return m[3]-0==i;}, + first: function(a,i){return i==0;}, + last: function(a,i,m,r){return i==r.length-1;}, + even: function(a,i){return i%2==0;}, + odd: function(a,i){return i%2;}, + + // Child Checks + "first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;}, + "last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;}, + "only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");}, + + // Parent Checks + parent: function(a){return a.firstChild;}, + empty: function(a){return !a.firstChild;}, + + // Text Check + contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;}, + + // Visibility + visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";}, + hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";}, + + // Form attributes + enabled: function(a){return !a.disabled;}, + disabled: function(a){return a.disabled;}, + checked: function(a){return a.checked;}, + selected: function(a){return a.selected||jQuery.attr(a,"selected");}, + + // Form elements + text: function(a){return "text"==a.type;}, + radio: function(a){return "radio"==a.type;}, + checkbox: function(a){return "checkbox"==a.type;}, + file: function(a){return "file"==a.type;}, + password: function(a){return "password"==a.type;}, + submit: function(a){return "submit"==a.type;}, + image: function(a){return "image"==a.type;}, + reset: function(a){return "reset"==a.type;}, + button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");}, + input: function(a){return /input|select|textarea|button/i.test(a.nodeName);}, + + // :has() + has: function(a,i,m){return jQuery.find(m[3],a).length;}, + + // :header + header: function(a){return /h\d/i.test(a.nodeName);}, + + // :animated + animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;} + } + }, + + // The regular expressions that power the parsing engine + parse: [ + // Match: [@value='test'], [@foo] + /^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/, + + // Match: :contains('foo') + /^(:)([\w-]+)$"?'?(.*?(\(.*?$)?[^(]*?)"?'?\)/, + + // Match: :even, :last-child, #id, .class + new RegExp("^([:.#]*)(" + chars + "+)") + ], + + multiFilter: function( expr, elems, not ) { + var old, cur = []; + + while ( expr && expr != old ) { + old = expr; + var f = jQuery.filter( expr, elems, not ); + expr = f.t.replace(/^\s*,\s*/, "" ); + cur = not ? elems = f.r : jQuery.merge( cur, f.r ); + } + + return cur; + }, + + find: function( t, context ) { + // Quickly handle non-string expressions + if ( typeof t != "string" ) + return [ t ]; + + // check to make sure context is a DOM element or a document + if ( context && context.nodeType != 1 && context.nodeType != 9) + return [ ]; + + // Set the correct context (if none is provided) + context = context || document; + + // Initialize the search + var ret = [context], done = [], last, nodeName; + + // Continue while a selector expression exists, and while + // we're no longer looping upon ourselves + while ( t && last != t ) { + var r = []; + last = t; + + t = jQuery.trim(t); + + var foundToken = false, + + // An attempt at speeding up child selectors that + // point to a specific element tag + re = quickChild, + + m = re.exec(t); + + if ( m ) { + nodeName = m[1].toUpperCase(); + + // Perform our own iteration and filter + for ( var i = 0; ret[i]; i++ ) + for ( var c = ret[i].firstChild; c; c = c.nextSibling ) + if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) ) + r.push( c ); + + ret = r; + t = t.replace( re, "" ); + if ( t.indexOf(" ") == 0 ) continue; + foundToken = true; + } else { + re = /^([>+~])\s*(\w*)/i; + + if ( (m = re.exec(t)) != null ) { + r = []; + + var merge = {}; + nodeName = m[2].toUpperCase(); + m = m[1]; + + for ( var j = 0, rl = ret.length; j < rl; j++ ) { + var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild; + for ( ; n; n = n.nextSibling ) + if ( n.nodeType == 1 ) { + var id = jQuery.data(n); + + if ( m == "~" && merge[id] ) break; + + if (!nodeName || n.nodeName.toUpperCase() == nodeName ) { + if ( m == "~" ) merge[id] = true; + r.push( n ); + } + + if ( m == "+" ) break; + } + } + + ret = r; + + // And remove the token + t = jQuery.trim( t.replace( re, "" ) ); + foundToken = true; + } + } + + // See if there's still an expression, and that we haven't already + // matched a token + if ( t && !foundToken ) { + // Handle multiple expressions + if ( !t.indexOf(",") ) { + // Clean the result set + if ( context == ret[0] ) ret.shift(); + + // Merge the result sets + done = jQuery.merge( done, ret ); + + // Reset the context + r = ret = [context]; + + // Touch up the selector string + t = " " + t.substr(1,t.length); + + } else { + // Optimize for the case nodeName#idName + var re2 = quickID; + var m = re2.exec(t); + + // Re-organize the results, so that they're consistent + if ( m ) { + m = [ 0, m[2], m[3], m[1] ]; + + } else { + // Otherwise, do a traditional filter check for + // ID, class, and element selectors + re2 = quickClass; + m = re2.exec(t); + } + + m[2] = m[2].replace(/\\/g, ""); + + var elem = ret[ret.length-1]; + + // Try to do a global search by ID, where we can + if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) { + // Optimization for HTML document case + var oid = elem.getElementById(m[2]); + + // Do a quick check for the existence of the actual ID attribute + // to avoid selecting by the name attribute in IE + // also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form + if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] ) + oid = jQuery('[@id="'+m[2]+'"]', elem)[0]; + + // Do a quick check for node name (where applicable) so + // that div#foo searches will be really fast + ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : []; + } else { + // We need to find all descendant elements + for ( var i = 0; ret[i]; i++ ) { + // Grab the tag name being searched for + var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2]; + + // Handle IE7 being really dumb about <object>s + if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" ) + tag = "param"; + + r = jQuery.merge( r, ret[i].getElementsByTagName( tag )); + } + + // It's faster to filter by class and be done with it + if ( m[1] == "." ) + r = jQuery.classFilter( r, m[2] ); + + // Same with ID filtering + if ( m[1] == "#" ) { + var tmp = []; + + // Try to find the element with the ID + for ( var i = 0; r[i]; i++ ) + if ( r[i].getAttribute("id") == m[2] ) { + tmp = [ r[i] ]; + break; + } + + r = tmp; + } + + ret = r; + } + + t = t.replace( re2, "" ); + } + + } + + // If a selector string still exists + if ( t ) { + // Attempt to filter it + var val = jQuery.filter(t,r); + ret = r = val.r; + t = jQuery.trim(val.t); + } + } + + // An error occurred with the selector; + // just return an empty set instead + if ( t ) + ret = []; + + // Remove the root context + if ( ret && context == ret[0] ) + ret.shift(); + + // And combine the results + done = jQuery.merge( done, ret ); + + return done; + }, + + classFilter: function(r,m,not){ + m = " " + m + " "; + var tmp = []; + for ( var i = 0; r[i]; i++ ) { + var pass = (" " + r[i].className + " ").indexOf( m ) >= 0; + if ( !not && pass || not && !pass ) + tmp.push( r[i] ); + } + return tmp; + }, + + filter: function(t,r,not) { + var last; + + // Look for common filter expressions + while ( t && t != last ) { + last = t; + + var p = jQuery.parse, m; + + for ( var i = 0; p[i]; i++ ) { + m = p[i].exec( t ); + + if ( m ) { + // Remove what we just matched + t = t.substring( m[0].length ); + + m[2] = m[2].replace(/\\/g, ""); + break; + } + } + + if ( !m ) + break; + + // :not() is a special case that can be optimized by + // keeping it out of the expression list + if ( m[1] == ":" && m[2] == "not" ) + // optimize if only one selector found (most common case) + r = isSimple.test( m[3] ) ? + jQuery.filter(m[3], r, true).r : + jQuery( r ).not( m[3] ); + + // We can get a big speed boost by filtering by class here + else if ( m[1] == "." ) + r = jQuery.classFilter(r, m[2], not); + + else if ( m[1] == "[" ) { + var tmp = [], type = m[3]; + + for ( var i = 0, rl = r.length; i < rl; i++ ) { + var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ]; + + if ( z == null || /href|src|selected/.test(m[2]) ) + z = jQuery.attr(a,m[2]) || ''; + + if ( (type == "" && !!z || + type == "=" && z == m[5] || + type == "!=" && z != m[5] || + type == "^=" && z && !z.indexOf(m[5]) || + type == "$=" && z.substr(z.length - m[5].length) == m[5] || + (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not ) + tmp.push( a ); + } + + r = tmp; + + // We can get a speed boost by handling nth-child here + } else if ( m[1] == ":" && m[2] == "nth-child" ) { + var merge = {}, tmp = [], + // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' + test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( + m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" || + !/\D/.test(m[3]) && "0n+" + m[3] || m[3]), + // calculate the numbers (first)n+(last) including if they are negative + first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0; + + // loop through all the elements left in the jQuery object + for ( var i = 0, rl = r.length; i < rl; i++ ) { + var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode); + + if ( !merge[id] ) { + var c = 1; + + for ( var n = parentNode.firstChild; n; n = n.nextSibling ) + if ( n.nodeType == 1 ) + n.nodeIndex = c++; + + merge[id] = true; + } + + var add = false; + + if ( first == 0 ) { + if ( node.nodeIndex == last ) + add = true; + } else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 ) + add = true; + + if ( add ^ not ) + tmp.push( node ); + } + + r = tmp; + + // Otherwise, find the expression to execute + } else { + var fn = jQuery.expr[ m[1] ]; + if ( typeof fn == "object" ) + fn = fn[ m[2] ]; + + if ( typeof fn == "string" ) + fn = eval("false||function(a,i){return " + fn + ";}"); + + // Execute it against the current filter + r = jQuery.grep( r, function(elem, i){ + return fn(elem, i, m, r); + }, not ); + } + } + + // Return an array of filtered elements (r) + // and the modified expression string (t) + return { r: r, t: t }; + }, + + dir: function( elem, dir ){ + var matched = [], + cur = elem[dir]; + while ( cur && cur != document ) { + if ( cur.nodeType == 1 ) + matched.push( cur ); + cur = cur[dir]; + } + return matched; + }, + + nth: function(cur,result,dir,elem){ + result = result || 1; + var num = 0; + + for ( ; cur; cur = cur[dir] ) + if ( cur.nodeType == 1 && ++num == result ) + break; + + return cur; + }, + + sibling: function( n, elem ) { + var r = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType == 1 && n != elem ) + r.push( n ); + } + + return r; + } +}); +/* + * A number of helper functions used for managing events. + * Many of the ideas behind this code orignated from + * Dean Edwards' addEvent library. + */ +jQuery.event = { + + // Bind an event to an element + // Original by Dean Edwards + add: function(elem, types, handler, data) { + if ( elem.nodeType == 3 || elem.nodeType == 8 ) + return; + + // For whatever reason, IE has trouble passing the window object + // around, causing it to be cloned in the process + if ( jQuery.browser.msie && elem.setInterval ) + elem = window; + + // Make sure that the function being executed has a unique ID + if ( !handler.guid ) + handler.guid = this.guid++; + + // if data is passed, bind to handler + if( data != undefined ) { + // Create temporary function pointer to original handler + var fn = handler; + + // Create unique handler function, wrapped around original handler + handler = this.proxy( fn, function() { + // Pass arguments and context to original handler + return fn.apply(this, arguments); + }); + + // Store data in unique handler + handler.data = data; + } + + // Init the element's event structure + var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}), + handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){ + // Handle the second event of a trigger and when + // an event is called after a page has unloaded + if ( typeof jQuery != "undefined" && !jQuery.event.triggered ) + return jQuery.event.handle.apply(arguments.callee.elem, arguments); + }); + // Add elem as a property of the handle function + // This is to prevent a memory leak with non-native + // event in IE. + handle.elem = elem; + + // Handle multiple events separated by a space + // jQuery(...).bind("mouseover mouseout", fn); + jQuery.each(types.split(/\s+/), function(index, type) { + // Namespaced event handlers + var parts = type.split("."); + type = parts[0]; + handler.type = parts[1]; + + // Get the current list of functions bound to this event + var handlers = events[type]; + + // Init the event handler queue + if (!handlers) { + handlers = events[type] = {}; + + // Check for a special event handler + // Only use addEventListener/attachEvent if the special + // events handler returns false + if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) { + // Bind the global event handler to the element + if (elem.addEventListener) + elem.addEventListener(type, handle, false); + else if (elem.attachEvent) + elem.attachEvent("on" + type, handle); + } + } + + // Add the function to the element's handler list + handlers[handler.guid] = handler; + + // Keep track of which events have been used, for global triggering + jQuery.event.global[type] = true; + }); + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + guid: 1, + global: {}, + + // Detach an event or set of events from an element + remove: function(elem, types, handler) { + // don't do events on text and comment nodes + if ( elem.nodeType == 3 || elem.nodeType == 8 ) + return; + + var events = jQuery.data(elem, "events"), ret, index; + + if ( events ) { + // Unbind all events for the element + if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") ) + for ( var type in events ) + this.remove( elem, type + (types || "") ); + else { + // types is actually an event object here + if ( types.type ) { + handler = types.handler; + types = types.type; + } + + // Handle multiple events seperated by a space + // jQuery(...).unbind("mouseover mouseout", fn); + jQuery.each(types.split(/\s+/), function(index, type){ + // Namespaced event handlers + var parts = type.split("."); + type = parts[0]; + + if ( events[type] ) { + // remove the given handler for the given type + if ( handler ) + delete events[type][handler.guid]; + + // remove all handlers for the given type + else + for ( handler in events[type] ) + // Handle the removal of namespaced events + if ( !parts[1] || events[type][handler].type == parts[1] ) + delete events[type][handler]; + + // remove generic event handler if no more handlers exist + for ( ret in events[type] ) break; + if ( !ret ) { + if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) { + if (elem.removeEventListener) + elem.removeEventListener(type, jQuery.data(elem, "handle"), false); + else if (elem.detachEvent) + elem.detachEvent("on" + type, jQuery.data(elem, "handle")); + } + ret = null; + delete events[type]; + } + } + }); + } + + // Remove the expando if it's no longer used + for ( ret in events ) break; + if ( !ret ) { + var handle = jQuery.data( elem, "handle" ); + if ( handle ) handle.elem = null; + jQuery.removeData( elem, "events" ); + jQuery.removeData( elem, "handle" ); + } + } + }, + + trigger: function(type, data, elem, donative, extra) { + // Clone the incoming data, if any + data = jQuery.makeArray(data); + + if ( type.indexOf("!") >= 0 ) { + type = type.slice(0, -1); + var exclusive = true; + } + + // Handle a global trigger + if ( !elem ) { + // Only trigger if we've ever bound an event for it + if ( this.global[type] ) + jQuery("*").add([window, document]).trigger(type, data); + + // Handle triggering a single element + } else { + // don't do events on text and comment nodes + if ( elem.nodeType == 3 || elem.nodeType == 8 ) + return undefined; + + var val, ret, fn = jQuery.isFunction( elem[ type ] || null ), + // Check to see if we need to provide a fake event, or not + event = !data[0] || !data[0].preventDefault; + + // Pass along a fake event + if ( event ) { + data.unshift({ + type: type, + target: elem, + preventDefault: function(){}, + stopPropagation: function(){}, + timeStamp: now() + }); + data[0][expando] = true; // no need to fix fake event + } + + // Enforce the right trigger type + data[0].type = type; + if ( exclusive ) + data[0].exclusive = true; + + // Trigger the event, it is assumed that "handle" is a function + var handle = jQuery.data(elem, "handle"); + if ( handle ) + val = handle.apply( elem, data ); + + // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links) + if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) + val = false; + + // Extra functions don't get the custom event object + if ( event ) + data.shift(); + + // Handle triggering of extra function + if ( extra && jQuery.isFunction( extra ) ) { + // call the extra function and tack the current return value on the end for possible inspection + ret = extra.apply( elem, val == null ? data : data.concat( val ) ); + // if anything is returned, give it precedence and have it overwrite the previous value + if (ret !== undefined) + val = ret; + } + + // Trigger the native events (except for clicks on links) + if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) { + this.triggered = true; + try { + elem[ type ](); + // prevent IE from throwing an error for some hidden elements + } catch (e) {} + } + + this.triggered = false; + } + + return val; + }, + + handle: function(event) { + // returned undefined or false + var val, ret, namespace, all, handlers; + + event = arguments[0] = jQuery.event.fix( event || window.event ); + + // Namespaced event handlers + namespace = event.type.split("."); + event.type = namespace[0]; + namespace = namespace[1]; + // Cache this now, all = true means, any handler + all = !namespace && !event.exclusive; + + handlers = ( jQuery.data(this, "events") || {} )[event.type]; + + for ( var j in handlers ) { + var handler = handlers[j]; + + // Filter the functions by class + if ( all || handler.type == namespace ) { + // Pass in a reference to the handler function itself + // So that we can later remove it + event.handler = handler; + event.data = handler.data; + + ret = handler.apply( this, arguments ); + + if ( val !== false ) + val = ret; + + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + + return val; + }, + + fix: function(event) { + if ( event[expando] == true ) + return event; + + // store a copy of the original event object + // and "clone" to set read-only properties + var originalEvent = event; + event = { originalEvent: originalEvent }; + var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" "); + for ( var i=props.length; i; i-- ) + event[ props[i] ] = originalEvent[ props[i] ]; + + // Mark it as fixed + event[expando] = true; + + // add preventDefault and stopPropagation since + // they will not work on the clone + event.preventDefault = function() { + // if preventDefault exists run it on the original event + if (originalEvent.preventDefault) + originalEvent.preventDefault(); + // otherwise set the returnValue property of the original event to false (IE) + originalEvent.returnValue = false; + }; + event.stopPropagation = function() { + // if stopPropagation exists run it on the original event + if (originalEvent.stopPropagation) + originalEvent.stopPropagation(); + // otherwise set the cancelBubble property of the original event to true (IE) + originalEvent.cancelBubble = true; + }; + + // Fix timeStamp + event.timeStamp = event.timeStamp || now(); + + // Fix target property, if necessary + if ( !event.target ) + event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either + + // check if target is a textnode (safari) + if ( event.target.nodeType == 3 ) + event.target = event.target.parentNode; + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && event.fromElement ) + event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && event.clientX != null ) { + var doc = document.documentElement, body = document.body; + event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0); + event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0); + } + + // Add which for key events + if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) + event.which = event.charCode || event.keyCode; + + // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) + if ( !event.metaKey && event.ctrlKey ) + event.metaKey = event.ctrlKey; + + // Add which for click: 1 == left; 2 == middle; 3 == right + // Note: button is not normalized, so don't use it + if ( !event.which && event.button ) + event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); + + return event; + }, + + proxy: function( fn, proxy ){ + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++; + // So proxy can be declared as an argument + return proxy; + }, + + special: { + ready: { + setup: function() { + // Make sure the ready event is setup + bindReady(); + return; + }, + + teardown: function() { return; } + }, + + mouseenter: { + setup: function() { + if ( jQuery.browser.msie ) return false; + jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler); + return true; + }, + + teardown: function() { + if ( jQuery.browser.msie ) return false; + jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler); + return true; + }, + + handler: function(event) { + // If we actually just moused on to a sub-element, ignore it + if ( withinElement(event, this) ) return true; + // Execute the right handlers by setting the event type to mouseenter + event.type = "mouseenter"; + return jQuery.event.handle.apply(this, arguments); + } + }, + + mouseleave: { + setup: function() { + if ( jQuery.browser.msie ) return false; + jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler); + return true; + }, + + teardown: function() { + if ( jQuery.browser.msie ) return false; + jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler); + return true; + }, + + handler: function(event) { + // If we actually just moused on to a sub-element, ignore it + if ( withinElement(event, this) ) return true; + // Execute the right handlers by setting the event type to mouseleave + event.type = "mouseleave"; + return jQuery.event.handle.apply(this, arguments); + } + } + } +}; + +jQuery.fn.extend({ + bind: function( type, data, fn ) { + return type == "unload" ? this.one(type, data, fn) : this.each(function(){ + jQuery.event.add( this, type, fn || data, fn && data ); + }); + }, + + one: function( type, data, fn ) { + var one = jQuery.event.proxy( fn || data, function(event) { + jQuery(this).unbind(event, one); + return (fn || data).apply( this, arguments ); + }); + return this.each(function(){ + jQuery.event.add( this, type, one, fn && data); + }); + }, + + unbind: function( type, fn ) { + return this.each(function(){ + jQuery.event.remove( this, type, fn ); + }); + }, + + trigger: function( type, data, fn ) { + return this.each(function(){ + jQuery.event.trigger( type, data, this, true, fn ); + }); + }, + + triggerHandler: function( type, data, fn ) { + return this[0] && jQuery.event.trigger( type, data, this[0], false, fn ); + }, + + toggle: function( fn ) { + // Save reference to arguments for access in closure + var args = arguments, i = 1; + + // link all the functions, so any of them can unbind this click handler + while( i < args.length ) + jQuery.event.proxy( fn, args[i++] ); + + return this.click( jQuery.event.proxy( fn, function(event) { + // Figure out which function to execute + this.lastToggle = ( this.lastToggle || 0 ) % i; + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ this.lastToggle++ ].apply( this, arguments ) || false; + })); + }, + + hover: function(fnOver, fnOut) { + return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut); + }, + + ready: function(fn) { + // Attach the listeners + bindReady(); + + // If the DOM is already ready + if ( jQuery.isReady ) + // Execute the function immediately + fn.call( document, jQuery ); + + // Otherwise, remember the function for later + else + // Add the function to the wait list + jQuery.readyList.push( function() { return fn.call(this, jQuery); } ); + + return this; + } +}); + +jQuery.extend({ + isReady: false, + readyList: [], + // Handle when the DOM is ready + ready: function() { + // Make sure that the DOM is not already loaded + if ( !jQuery.isReady ) { + // Remember that the DOM is ready + jQuery.isReady = true; + + // If there are functions bound, to execute + if ( jQuery.readyList ) { + // Execute all of them + jQuery.each( jQuery.readyList, function(){ + this.call( document ); + }); + + // Reset the list of functions + jQuery.readyList = null; + } + + // Trigger any bound ready events + jQuery(document).triggerHandler("ready"); + } + } +}); + +var readyBound = false; + +function bindReady(){ + if ( readyBound ) return; + readyBound = true; + + // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event + if ( document.addEventListener && !jQuery.browser.opera) + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", jQuery.ready, false ); + + // If IE is used and is not in a frame + // Continually check to see if the document is ready + if ( jQuery.browser.msie && window == top ) (function(){ + if (jQuery.isReady) return; + try { + // If IE is used, use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + document.documentElement.doScroll("left"); + } catch( error ) { + setTimeout( arguments.callee, 0 ); + return; + } + // and execute any waiting functions + jQuery.ready(); + })(); + + if ( jQuery.browser.opera ) + document.addEventListener( "DOMContentLoaded", function () { + if (jQuery.isReady) return; + for (var i = 0; i < document.styleSheets.length; i++) + if (document.styleSheets[i].disabled) { + setTimeout( arguments.callee, 0 ); + return; + } + // and execute any waiting functions + jQuery.ready(); + }, false); + + if ( jQuery.browser.safari ) { + var numStyles; + (function(){ + if (jQuery.isReady) return; + if ( document.readyState != "loaded" && document.readyState != "complete" ) { + setTimeout( arguments.callee, 0 ); + return; + } + if ( numStyles === undefined ) + numStyles = jQuery("style, link[rel=stylesheet]").length; + if ( document.styleSheets.length != numStyles ) { + setTimeout( arguments.callee, 0 ); + return; + } + // and execute any waiting functions + jQuery.ready(); + })(); + } + + // A fallback to window.onload, that will always work + jQuery.event.add( window, "load", jQuery.ready ); +} + +jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," + + "mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + + "submit,keydown,keypress,keyup,error").split(","), function(i, name){ + + // Handle event binding + jQuery.fn[name] = function(fn){ + return fn ? this.bind(name, fn) : this.trigger(name); + }; +}); + +// Checks if an event happened on an element within another element +// Used in jQuery.event.special.mouseenter and mouseleave handlers +var withinElement = function(event, elem) { + // Check if mouse(over|out) are still within the same parent element + var parent = event.relatedTarget; + // Traverse up the tree + while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; } + // Return true if we actually just moused on to a sub-element + return parent == elem; +}; + +// Prevent memory leaks in IE +// And prevent errors on refresh with events like mouseover in other browsers +// Window isn't included so as not to unbind existing unload events +jQuery(window).bind("unload", function() { + jQuery("*").add(document).unbind(); +}); +jQuery.fn.extend({ + // Keep a copy of the old load + _load: jQuery.fn.load, + + load: function( url, params, callback ) { + if ( typeof url != 'string' ) + return this._load( url ); + + var off = url.indexOf(" "); + if ( off >= 0 ) { + var selector = url.slice(off, url.length); + url = url.slice(0, off); + } + + callback = callback || function(){}; + + // Default to a GET request + var type = "GET"; + + // If the second parameter was provided + if ( params ) + // If it's a function + if ( jQuery.isFunction( params ) ) { + // We assume that it's the callback + callback = params; + params = null; + + // Otherwise, build a param string + } else { + params = jQuery.param( params ); + type = "POST"; + } + + var self = this; + + // Request the remote document + jQuery.ajax({ + url: url, + type: type, + dataType: "html", + data: params, + complete: function(res, status){ + // If successful, inject the HTML into all the matched elements + if ( status == "success" || status == "notmodified" ) + // See if a selector was specified + self.html( selector ? + // Create a dummy div to hold the results + jQuery("<div/>") + // inject the contents of the document in, removing the scripts + // to avoid any 'Permission Denied' errors in IE + .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, "")) + + // Locate the specified elements + .find(selector) : + + // If not, just inject the full result + res.responseText ); + + self.each( callback, [res.responseText, status, res] ); + } + }); + return this; + }, + + serialize: function() { + return jQuery.param(this.serializeArray()); + }, + serializeArray: function() { + return this.map(function(){ + return jQuery.nodeName(this, "form") ? + jQuery.makeArray(this.elements) : this; + }) + .filter(function(){ + return this.name && !this.disabled && + (this.checked || /select|textarea/i.test(this.nodeName) || + /text|hidden|password/i.test(this.type)); + }) + .map(function(i, elem){ + var val = jQuery(this).val(); + return val == null ? null : + val.constructor == Array ? + jQuery.map( val, function(val, i){ + return {name: elem.name, value: val}; + }) : + {name: elem.name, value: val}; + }).get(); + } +}); + +// Attach a bunch of functions for handling common AJAX events +jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){ + jQuery.fn[o] = function(f){ + return this.bind(o, f); + }; +}); + +var jsc = now(); + +jQuery.extend({ + get: function( url, data, callback, type ) { + // shift arguments if data argument was ommited + if ( jQuery.isFunction( data ) ) { + callback = data; + data = null; + } + + return jQuery.ajax({ + type: "GET", + url: url, + data: data, + success: callback, + dataType: type + }); + }, + + getScript: function( url, callback ) { + return jQuery.get(url, null, callback, "script"); + }, + + getJSON: function( url, data, callback ) { + return jQuery.get(url, data, callback, "json"); + }, + + post: function( url, data, callback, type ) { + if ( jQuery.isFunction( data ) ) { + callback = data; + data = {}; + } + + return jQuery.ajax({ + type: "POST", + url: url, + data: data, + success: callback, + dataType: type + }); + }, + + ajaxSetup: function( settings ) { + jQuery.extend( jQuery.ajaxSettings, settings ); + }, + + ajaxSettings: { + url: location.href, + global: true, + type: "GET", + timeout: 0, + contentType: "application/x-www-form-urlencoded", + processData: true, + async: true, + data: null, + username: null, + password: null, + accepts: { + xml: "application/xml, text/xml", + html: "text/html", + script: "text/javascript, application/javascript", + json: "application/json, text/javascript", + text: "text/plain", + _default: "*/*" + } + }, + + // Last-Modified header cache for next request + lastModified: {}, + + ajax: function( s ) { + // Extend the settings, but re-extend 's' so that it can be + // checked again later (in the test suite, specifically) + s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); + + var jsonp, jsre = /=\?(&|$)/g, status, data, + type = s.type.toUpperCase(); + + // convert data if not already a string + if ( s.data && s.processData && typeof s.data != "string" ) + s.data = jQuery.param(s.data); + + // Handle JSONP Parameter Callbacks + if ( s.dataType == "jsonp" ) { + if ( type == "GET" ) { + if ( !s.url.match(jsre) ) + s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?"; + } else if ( !s.data || !s.data.match(jsre) ) + s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?"; + s.dataType = "json"; + } + + // Build temporary JSONP function + if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) { + jsonp = "jsonp" + jsc++; + + // Replace the =? sequence both in the query string and the data + if ( s.data ) + s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1"); + s.url = s.url.replace(jsre, "=" + jsonp + "$1"); + + // We need to make sure + // that a JSONP style response is executed properly + s.dataType = "script"; + + // Handle JSONP-style loading + window[ jsonp ] = function(tmp){ + data = tmp; + success(); + complete(); + // Garbage collect + window[ jsonp ] = undefined; + try{ delete window[ jsonp ]; } catch(e){} + if ( head ) + head.removeChild( script ); + }; + } + + if ( s.dataType == "script" && s.cache == null ) + s.cache = false; + + if ( s.cache === false && type == "GET" ) { + var ts = now(); + // try replacing _= if it is there + var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2"); + // if nothing was replaced, add timestamp to the end + s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : ""); + } + + // If data is available, append data to url for get requests + if ( s.data && type == "GET" ) { + s.url += (s.url.match(/\?/) ? "&" : "?") + s.data; + + // IE likes to send both get and post data, prevent this + s.data = null; + } + + // Watch for a new set of requests + if ( s.global && ! jQuery.active++ ) + jQuery.event.trigger( "ajaxStart" ); + + // Matches an absolute URL, and saves the domain + var remote = /^(?:\w+:)?\/\/([^\/?#]+)/; + + // If we're requesting a remote document + // and trying to load JSON or Script with a GET + if ( s.dataType == "script" && type == "GET" + && remote.test(s.url) && remote.exec(s.url)[1] != location.host ){ + var head = document.getElementsByTagName("head")[0]; + var script = document.createElement("script"); + script.src = s.url; + if (s.scriptCharset) + script.charset = s.scriptCharset; + + // Handle Script loading + if ( !jsonp ) { + var done = false; + + // Attach handlers for all browsers + script.onload = script.onreadystatechange = function(){ + if ( !done && (!this.readyState || + this.readyState == "loaded" || this.readyState == "complete") ) { + done = true; + success(); + complete(); + head.removeChild( script ); + } + }; + } + + head.appendChild(script); + + // We handle everything using the script element injection + return undefined; + } + + var requestDone = false; + + // Create the request object; Microsoft failed to properly + // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available + var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); + + // Open the socket + // Passing null username, generates a login popup on Opera (#2865) + if( s.username ) + xhr.open(type, s.url, s.async, s.username, s.password); + else + xhr.open(type, s.url, s.async); + + // Need an extra try/catch for cross domain requests in Firefox 3 + try { + // Set the correct header, if data is being sent + if ( s.data ) + xhr.setRequestHeader("Content-Type", s.contentType); + + // Set the If-Modified-Since header, if ifModified mode. + if ( s.ifModified ) + xhr.setRequestHeader("If-Modified-Since", + jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" ); + + // Set header so the called script knows that it's an XMLHttpRequest + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest"); + + // Set the Accepts header for the server, depending on the dataType + xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? + s.accepts[ s.dataType ] + ", */*" : + s.accepts._default ); + } catch(e){} + + // Allow custom headers/mimetypes + if ( s.beforeSend && s.beforeSend(xhr, s) === false ) { + // cleanup active request counter + s.global && jQuery.active--; + // close opended socket + xhr.abort(); + return false; + } + + if ( s.global ) + jQuery.event.trigger("ajaxSend", [xhr, s]); + + // Wait for a response to come back + var onreadystatechange = function(isTimeout){ + // The transfer is complete and the data is available, or the request timed out + if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) { + requestDone = true; + + // clear poll interval + if (ival) { + clearInterval(ival); + ival = null; + } + + status = isTimeout == "timeout" && "timeout" || + !jQuery.httpSuccess( xhr ) && "error" || + s.ifModified && jQuery.httpNotModified( xhr, s.url ) && "notmodified" || + "success"; + + if ( status == "success" ) { + // Watch for, and catch, XML document parse errors + try { + // process the data (runs the xml through httpData regardless of callback) + data = jQuery.httpData( xhr, s.dataType, s.dataFilter ); + } catch(e) { + status = "parsererror"; + } + } + + // Make sure that the request was successful or notmodified + if ( status == "success" ) { + // Cache Last-Modified header, if ifModified mode. + var modRes; + try { + modRes = xhr.getResponseHeader("Last-Modified"); + } catch(e) {} // swallow exception thrown by FF if header is not available + + if ( s.ifModified && modRes ) + jQuery.lastModified[s.url] = modRes; + + // JSONP handles its own success callback + if ( !jsonp ) + success(); + } else + jQuery.handleError(s, xhr, status); + + // Fire the complete handlers + complete(); + + // Stop memory leaks + if ( s.async ) + xhr = null; + } + }; + + if ( s.async ) { + // don't attach the handler to the request, just poll it instead + var ival = setInterval(onreadystatechange, 13); + + // Timeout checker + if ( s.timeout > 0 ) + setTimeout(function(){ + // Check to see if the request is still happening + if ( xhr ) { + // Cancel the request + xhr.abort(); + + if( !requestDone ) + onreadystatechange( "timeout" ); + } + }, s.timeout); + } + + // Send the data + try { + xhr.send(s.data); + } catch(e) { + jQuery.handleError(s, xhr, null, e); + } + + // firefox 1.5 doesn't fire statechange for sync requests + if ( !s.async ) + onreadystatechange(); + + function success(){ + // If a local callback was specified, fire it and pass it the data + if ( s.success ) + s.success( data, status ); + + // Fire the global callback + if ( s.global ) + jQuery.event.trigger( "ajaxSuccess", [xhr, s] ); + } + + function complete(){ + // Process result + if ( s.complete ) + s.complete(xhr, status); + + // The request was completed + if ( s.global ) + jQuery.event.trigger( "ajaxComplete", [xhr, s] ); + + // Handle the global AJAX counter + if ( s.global && ! --jQuery.active ) + jQuery.event.trigger( "ajaxStop" ); + } + + // return XMLHttpRequest to allow aborting the request etc. + return xhr; + }, + + handleError: function( s, xhr, status, e ) { + // If a local callback was specified, fire it + if ( s.error ) s.error( xhr, status, e ); + + // Fire the global callback + if ( s.global ) + jQuery.event.trigger( "ajaxError", [xhr, s, e] ); + }, + + // Counter for holding the number of active queries + active: 0, + + // Determines if an XMLHttpRequest was successful or not + httpSuccess: function( xhr ) { + try { + // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450 + return !xhr.status && location.protocol == "file:" || + ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 || + jQuery.browser.safari && xhr.status == undefined; + } catch(e){} + return false; + }, + + // Determines if an XMLHttpRequest returns NotModified + httpNotModified: function( xhr, url ) { + try { + var xhrRes = xhr.getResponseHeader("Last-Modified"); + + // Firefox always returns 200. check Last-Modified date + return xhr.status == 304 || xhrRes == jQuery.lastModified[url] || + jQuery.browser.safari && xhr.status == undefined; + } catch(e){} + return false; + }, + + httpData: function( xhr, type, filter ) { + var ct = xhr.getResponseHeader("content-type"), + xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0, + data = xml ? xhr.responseXML : xhr.responseText; + + if ( xml && data.documentElement.tagName == "parsererror" ) + throw "parsererror"; + + // Allow a pre-filtering function to sanitize the response + if( filter ) + data = filter( data, type ); + + // If the type is "script", eval it in global context + if ( type == "script" ) + jQuery.globalEval( data ); + + // Get the JavaScript object, if JSON is used. + if ( type == "json" ) + data = eval("(" + data + ")"); + + return data; + }, + + // Serialize an array of form elements or a set of + // key/values into a query string + param: function( a ) { + var s = []; + + // If an array was passed in, assume that it is an array + // of form elements + if ( a.constructor == Array || a.jquery ) + // Serialize the form elements + jQuery.each( a, function(){ + s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) ); + }); + + // Otherwise, assume that it's an object of key/value pairs + else + // Serialize the key/values + for ( var j in a ) + // If the value is an array then the key names need to be repeated + if ( a[j] && a[j].constructor == Array ) + jQuery.each( a[j], function(){ + s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) ); + }); + else + s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) ); + + // Return the resulting serialization + return s.join("&").replace(/%20/g, "+"); + } + +}); +jQuery.fn.extend({ + show: function(speed,callback){ + return speed ? + this.animate({ + height: "show", width: "show", opacity: "show" + }, speed, callback) : + + this.filter(":hidden").each(function(){ + this.style.display = this.oldblock || ""; + if ( jQuery.css(this,"display") == "none" ) { + var elem = jQuery("<" + this.tagName + " />").appendTo("body"); + this.style.display = elem.css("display"); + // handle an edge condition where css is - div { display:none; } or similar + if (this.style.display == "none") + this.style.display = "block"; + elem.remove(); + } + }).end(); + }, + + hide: function(speed,callback){ + return speed ? + this.animate({ + height: "hide", width: "hide", opacity: "hide" + }, speed, callback) : + + this.filter(":visible").each(function(){ + this.oldblock = this.oldblock || jQuery.css(this,"display"); + this.style.display = "none"; + }).end(); + }, + + // Save the old toggle function + _toggle: jQuery.fn.toggle, + + toggle: function( fn, fn2 ){ + return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ? + this._toggle.apply( this, arguments ) : + fn ? + this.animate({ + height: "toggle", width: "toggle", opacity: "toggle" + }, fn, fn2) : + this.each(function(){ + jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ](); + }); + }, + + slideDown: function(speed,callback){ + return this.animate({height: "show"}, speed, callback); + }, + + slideUp: function(speed,callback){ + return this.animate({height: "hide"}, speed, callback); + }, + + slideToggle: function(speed, callback){ + return this.animate({height: "toggle"}, speed, callback); + }, + + fadeIn: function(speed, callback){ + return this.animate({opacity: "show"}, speed, callback); + }, + + fadeOut: function(speed, callback){ + return this.animate({opacity: "hide"}, speed, callback); + }, + + fadeTo: function(speed,to,callback){ + return this.animate({opacity: to}, speed, callback); + }, + + animate: function( prop, speed, easing, callback ) { + var optall = jQuery.speed(speed, easing, callback); + + return this[ optall.queue === false ? "each" : "queue" ](function(){ + if ( this.nodeType != 1) + return false; + + var opt = jQuery.extend({}, optall), p, + hidden = jQuery(this).is(":hidden"), self = this; + + for ( p in prop ) { + if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) + return opt.complete.call(this); + + if ( p == "height" || p == "width" ) { + // Store display property + opt.display = jQuery.css(this, "display"); + + // Make sure that nothing sneaks out + opt.overflow = this.style.overflow; + } + } + + if ( opt.overflow != null ) + this.style.overflow = "hidden"; + + opt.curAnim = jQuery.extend({}, prop); + + jQuery.each( prop, function(name, val){ + var e = new jQuery.fx( self, opt, name ); + + if ( /toggle|show|hide/.test(val) ) + e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); + else { + var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/), + start = e.cur(true) || 0; + + if ( parts ) { + var end = parseFloat(parts[2]), + unit = parts[3] || "px"; + + // We need to compute starting value + if ( unit != "px" ) { + self.style[ name ] = (end || 1) + unit; + start = ((end || 1) / e.cur(true)) * start; + self.style[ name ] = start + unit; + } + + // If a +=/-= token was provided, we're doing a relative animation + if ( parts[1] ) + end = ((parts[1] == "-=" ? -1 : 1) * end) + start; + + e.custom( start, end, unit ); + } else + e.custom( start, val, "" ); + } + }); + + // For JS strict compliance + return true; + }); + }, + + queue: function(type, fn){ + if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) { + fn = type; + type = "fx"; + } + + if ( !type || (typeof type == "string" && !fn) ) + return queue( this[0], type ); + + return this.each(function(){ + if ( fn.constructor == Array ) + queue(this, type, fn); + else { + queue(this, type).push( fn ); + + if ( queue(this, type).length == 1 ) + fn.call(this); + } + }); + }, + + stop: function(clearQueue, gotoEnd){ + var timers = jQuery.timers; + + if (clearQueue) + this.queue([]); + + this.each(function(){ + // go in reverse order so anything added to the queue during the loop is ignored + for ( var i = timers.length - 1; i >= 0; i-- ) + if ( timers[i].elem == this ) { + if (gotoEnd) + // force the next step to be the last + timers[i](true); + timers.splice(i, 1); + } + }); + + // start the next in the queue if the last step wasn't forced + if (!gotoEnd) + this.dequeue(); + + return this; + } + +}); + +var queue = function( elem, type, array ) { + if ( elem ){ + + type = type || "fx"; + + var q = jQuery.data( elem, type + "queue" ); + + if ( !q || array ) + q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) ); + + } + return q; +}; + +jQuery.fn.dequeue = function(type){ + type = type || "fx"; + + return this.each(function(){ + var q = queue(this, type); + + q.shift(); + + if ( q.length ) + q[0].call( this ); + }); +}; + +jQuery.extend({ + + speed: function(speed, easing, fn) { + var opt = speed && speed.constructor == Object ? speed : { + complete: fn || !fn && easing || + jQuery.isFunction( speed ) && speed, + duration: speed, + easing: fn && easing || easing && easing.constructor != Function && easing + }; + + opt.duration = (opt.duration && opt.duration.constructor == Number ? + opt.duration : + jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def; + + // Queueing + opt.old = opt.complete; + opt.complete = function(){ + if ( opt.queue !== false ) + jQuery(this).dequeue(); + if ( jQuery.isFunction( opt.old ) ) + opt.old.call( this ); + }; + + return opt; + }, + + easing: { + linear: function( p, n, firstNum, diff ) { + return firstNum + diff * p; + }, + swing: function( p, n, firstNum, diff ) { + return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum; + } + }, + + timers: [], + timerId: null, + + fx: function( elem, options, prop ){ + this.options = options; + this.elem = elem; + this.prop = prop; + + if ( !options.orig ) + options.orig = {}; + } + +}); + +jQuery.fx.prototype = { + + // Simple function for setting a style value + update: function(){ + if ( this.options.step ) + this.options.step.call( this.elem, this.now, this ); + + (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this ); + + // Set display property to block for height/width animations + if ( this.prop == "height" || this.prop == "width" ) + this.elem.style.display = "block"; + }, + + // Get the current size + cur: function(force){ + if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null ) + return this.elem[ this.prop ]; + + var r = parseFloat(jQuery.css(this.elem, this.prop, force)); + return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; + }, + + // Start an animation from one number to another + custom: function(from, to, unit){ + this.startTime = now(); + this.start = from; + this.end = to; + this.unit = unit || this.unit || "px"; + this.now = this.start; + this.pos = this.state = 0; + this.update(); + + var self = this; + function t(gotoEnd){ + return self.step(gotoEnd); + } + + t.elem = this.elem; + + jQuery.timers.push(t); + + if ( jQuery.timerId == null ) { + jQuery.timerId = setInterval(function(){ + var timers = jQuery.timers; + + for ( var i = 0; i < timers.length; i++ ) + if ( !timers[i]() ) + timers.splice(i--, 1); + + if ( !timers.length ) { + clearInterval( jQuery.timerId ); + jQuery.timerId = null; + } + }, 13); + } + }, + + // Simple 'show' function + show: function(){ + // Remember where we started, so that we can go back to it later + this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); + this.options.show = true; + + // Begin the animation + this.custom(0, this.cur()); + + // Make sure that we start at a small width/height to avoid any + // flash of content + if ( this.prop == "width" || this.prop == "height" ) + this.elem.style[this.prop] = "1px"; + + // Start by showing the element + jQuery(this.elem).show(); + }, + + // Simple 'hide' function + hide: function(){ + // Remember where we started, so that we can go back to it later + this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); + this.options.hide = true; + + // Begin the animation + this.custom(this.cur(), 0); + }, + + // Each step of an animation + step: function(gotoEnd){ + var t = now(); + + if ( gotoEnd || t > this.options.duration + this.startTime ) { + this.now = this.end; + this.pos = this.state = 1; + this.update(); + + this.options.curAnim[ this.prop ] = true; + + var done = true; + for ( var i in this.options.curAnim ) + if ( this.options.curAnim[i] !== true ) + done = false; + + if ( done ) { + if ( this.options.display != null ) { + // Reset the overflow + this.elem.style.overflow = this.options.overflow; + + // Reset the display + this.elem.style.display = this.options.display; + if ( jQuery.css(this.elem, "display") == "none" ) + this.elem.style.display = "block"; + } + + // Hide the element if the "hide" operation was done + if ( this.options.hide ) + this.elem.style.display = "none"; + + // Reset the properties, if the item has been hidden or shown + if ( this.options.hide || this.options.show ) + for ( var p in this.options.curAnim ) + jQuery.attr(this.elem.style, p, this.options.orig[p]); + } + + if ( done ) + // Execute the complete function + this.options.complete.call( this.elem ); + + return false; + } else { + var n = t - this.startTime; + this.state = n / this.options.duration; + + // Perform the easing function, defaults to swing + this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration); + this.now = this.start + ((this.end - this.start) * this.pos); + + // Perform the next step of the animation + this.update(); + } + + return true; + } + +}; + +jQuery.extend( jQuery.fx, { + speeds:{ + slow: 600, + fast: 200, + // Default speed + def: 400 + }, + step: { + scrollLeft: function(fx){ + fx.elem.scrollLeft = fx.now; + }, + + scrollTop: function(fx){ + fx.elem.scrollTop = fx.now; + }, + + opacity: function(fx){ + jQuery.attr(fx.elem.style, "opacity", fx.now); + }, + + _default: function(fx){ + fx.elem.style[ fx.prop ] = fx.now + fx.unit; + } + } +}); +// The Offset Method +// Originally By Brandon Aaron, part of the Dimension Plugin +// http://jquery.com/plugins/project/dimensions +jQuery.fn.offset = function() { + var left = 0, top = 0, elem = this[0], results; + + if ( elem ) with ( jQuery.browser ) { + var parent = elem.parentNode, + offsetChild = elem, + offsetParent = elem.offsetParent, + doc = elem.ownerDocument, + safari2 = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent), + css = jQuery.curCSS, + fixed = css(elem, "position") == "fixed"; + + // Use getBoundingClientRect if available + if ( elem.getBoundingClientRect ) { + var box = elem.getBoundingClientRect(); + + // Add the document scroll offsets + add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft), + box.top + Math.max(doc.documentElement.scrollTop, doc.body.scrollTop)); + + // IE adds the HTML element's border, by default it is medium which is 2px + // IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; } + // IE 7 standards mode, the border is always 2px + // This border/offset is typically represented by the clientLeft and clientTop properties + // However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS + // Therefore this method will be off by 2px in IE while in quirksmode + add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop ); + + // Otherwise loop through the offsetParents and parentNodes + } else { + + // Initial element offsets + add( elem.offsetLeft, elem.offsetTop ); + + // Get parent offsets + while ( offsetParent ) { + // Add offsetParent offsets + add( offsetParent.offsetLeft, offsetParent.offsetTop ); + + // Mozilla and Safari > 2 does not include the border on offset parents + // However Mozilla adds the border for table or table cells + if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 ) + border( offsetParent ); + + // Add the document scroll offsets if position is fixed on any offsetParent + if ( !fixed && css(offsetParent, "position") == "fixed" ) + fixed = true; + + // Set offsetChild to previous offsetParent unless it is the body element + offsetChild = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent; + // Get next offsetParent + offsetParent = offsetParent.offsetParent; + } + + // Get parent scroll offsets + while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) { + // Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug + if ( !/^inline|table.*$/i.test(css(parent, "display")) ) + // Subtract parent scroll offsets + add( -parent.scrollLeft, -parent.scrollTop ); + + // Mozilla does not add the border for a parent that has overflow != visible + if ( mozilla && css(parent, "overflow") != "visible" ) + border( parent ); + + // Get next parent + parent = parent.parentNode; + } + + // Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild + // Mozilla doubles body offsets with a non-absolutely positioned offsetChild + if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) || + (mozilla && css(offsetChild, "position") != "absolute") ) + add( -doc.body.offsetLeft, -doc.body.offsetTop ); + + // Add the document scroll offsets if position is fixed + if ( fixed ) + add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft), + Math.max(doc.documentElement.scrollTop, doc.body.scrollTop)); + } + + // Return an object with top and left properties + results = { top: top, left: left }; + } + + function border(elem) { + add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) ); + } + + function add(l, t) { + left += parseInt(l, 10) || 0; + top += parseInt(t, 10) || 0; + } + + return results; +}; + + +jQuery.fn.extend({ + position: function() { + var left = 0, top = 0, results; + + if ( this[0] ) { + // Get *real* offsetParent + var offsetParent = this.offsetParent(), + + // Get correct offsets + offset = this.offset(), + parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset(); + + // Subtract element margins + // note: when an element has margin: auto the offsetLeft and marginLeft + // are the same in Safari causing offset.left to incorrectly be 0 + offset.top -= num( this, 'marginTop' ); + offset.left -= num( this, 'marginLeft' ); + + // Add offsetParent borders + parentOffset.top += num( offsetParent, 'borderTopWidth' ); + parentOffset.left += num( offsetParent, 'borderLeftWidth' ); + + // Subtract the two offsets + results = { + top: offset.top - parentOffset.top, + left: offset.left - parentOffset.left + }; + } + + return results; + }, + + offsetParent: function() { + var offsetParent = this[0].offsetParent; + while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') ) + offsetParent = offsetParent.offsetParent; + return jQuery(offsetParent); + } +}); + + +// Create scrollLeft and scrollTop methods +jQuery.each( ['Left', 'Top'], function(i, name) { + var method = 'scroll' + name; + + jQuery.fn[ method ] = function(val) { + if (!this[0]) return; + + return val != undefined ? + + // Set the scroll offset + this.each(function() { + this == window || this == document ? + window.scrollTo( + !i ? val : jQuery(window).scrollLeft(), + i ? val : jQuery(window).scrollTop() + ) : + this[ method ] = val; + }) : + + // Return the scroll offset + this[0] == window || this[0] == document ? + self[ i ? 'pageYOffset' : 'pageXOffset' ] || + jQuery.boxModel && document.documentElement[ method ] || + document.body[ method ] : + this[0][ method ]; + }; +}); +// Create innerHeight, innerWidth, outerHeight and outerWidth methods +jQuery.each([ "Height", "Width" ], function(i, name){ + + var tl = i ? "Left" : "Top", // top or left + br = i ? "Right" : "Bottom"; // bottom or right + + // innerHeight and innerWidth + jQuery.fn["inner" + name] = function(){ + return this[ name.toLowerCase() ]() + + num(this, "padding" + tl) + + num(this, "padding" + br); + }; + + // outerHeight and outerWidth + jQuery.fn["outer" + name] = function(margin) { + return this["inner" + name]() + + num(this, "border" + tl + "Width") + + num(this, "border" + br + "Width") + + (margin ? + num(this, "margin" + tl) + num(this, "margin" + br) : 0); + }; + +});})(); Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/jquery-1.2.6.js ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/pngFix.js =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/pngFix.js (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/pngFix.js 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,82 @@ +(function($) { + +jQuery.fn.pngFix = function(settings) { + + // Settings + settings = jQuery.extend({ + blankgif: 'blank.gif' + }, settings); + + var ie55 = (navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 5.5") != -1); + var ie6 = (navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 6.0") != -1); + + if (jQuery.browser.msie && (ie55 || ie6)) { + + //fix images with png-source + jQuery(this).find("img[(a)src$=.png]").each(function() { + + jQuery(this).attr('width',jQuery(this).width()); + jQuery(this).attr('height',jQuery(this).height()); + + var prevStyle = ''; + var strNewHTML = ''; + var imgId = (jQuery(this).attr('id')) ? 'id="' + jQuery(this).attr('id') + '" ' : ''; + var imgClass = (jQuery(this).attr('class')) ? 'class="' + jQuery(this).attr('class') + '" ' : ''; + var imgTitle = (jQuery(this).attr('title')) ? 'title="' + jQuery(this).attr('title') + '" ' : ''; + var imgAlt = (jQuery(this).attr('alt')) ? 'alt="' + jQuery(this).attr('alt') + '" ' : ''; + var imgAlign = (jQuery(this).attr('align')) ? 'float:' + jQuery(this).attr('align') + ';' : ''; + var imgHand = (jQuery(this).parent().attr('href')) ? 'cursor:hand;' : ''; + if (this.style.border) { + prevStyle += 'border:'+this.style.border+';'; + this.style.border = ''; + } + if (this.style.padding) { + prevStyle += 'padding:'+this.style.padding+';'; + this.style.padding = ''; + } + if (this.style.margin) { + prevStyle += 'margin:'+this.style.margin+';'; + this.style.margin = ''; + } + var imgStyle = (this.style.cssText); + + strNewHTML += '<span '+imgId+imgClass+imgTitle+imgAlt; + strNewHTML += 'style="position:relative;white-space:pre-line;display:inline-block;background:transparent;'+imgAlign+imgHand; + strNewHTML += 'width:' + jQuery(this).width() + 'px;' + 'height:' + jQuery(this).height() + 'px;'; + strNewHTML += 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader' + '(src=\'' + jQuery(this).attr('src') + '\', sizingMethod=\'scale\');'; + strNewHTML += imgStyle+'"></span>'; + if (prevStyle != ''){ + strNewHTML = '<span style="position:relative;display:inline-block;'+prevStyle+imgHand+'width:' + jQuery(this).width() + 'px;' + 'height:' + jQuery(this).height() + 'px;'+'">' + strNewHTML + '</span>'; + } + + jQuery(this).hide(); + jQuery(this).after(strNewHTML); + + }); + + // fix css background pngs + jQuery(this).find("*").each(function(){ + var bgIMG = jQuery(this).css('background-image'); + if(bgIMG.indexOf(".png")!=-1){ + var iebg = bgIMG.split('url("')[1].split('")')[0]; + jQuery(this).css('background-image', 'none'); + jQuery(this).get(0).runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + iebg + "',sizingMethod='scale')"; + } + }); + + //fix input with png-source + jQuery(this).find("input[(a)src$=.png]").each(function() { + var bgIMG = jQuery(this).attr('src'); + jQuery(this).get(0).runtimeStyle.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader' + '(src=\'' + bgIMG + '\', sizingMethod=\'scale\');'; + jQuery(this).attr('src', settings.blankgif) + }); + + }else{ + return false; + } + + return jQuery; + +}; + +})(jQuery); Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/pngFix.js ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.colorpicker.js =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.colorpicker.js (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.colorpicker.js 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,518 @@ +if (!window.Richfaces) window.Richfaces = {}; +(function ($) { +$.widget("ui.colorPicker", { + _init: function() { + this.charMin = 65; + var o = this.options, self = this, + tpl = $(o.clientId.toString()+"-popup"); + if (typeof o.color == 'string') { + this.color = this._HexToHSB(o.color); + } else if (o.color.r != undefined && o.color.g != undefined && o.color.b != undefined) { + this.color = this._RGBToHSB(o.color); + } else if (o.color.h != undefined && o.color.s != undefined && o.color.b != undefined) { + this.color = this._fixHSB(o.color); + } else { + return this; + } + + this.showEvent = o.showEvent; + this.origColor = this.color; + this.picker = $(tpl); + if (o.flat) { + this.picker.show(); + } + + this.fields = this.picker.find('input') + .bind('keydown', function(e) { return self._keyDown.call(self, e); }) + .bind('change', function(e) { return self._change.call(self, e); }) + .bind('blur', function(e) { return self._blur.call(self, e); }) + .bind('focus', function(e) { return self._focus.call(self, e); }); + +/* this.picker.find('span').bind('mousedown', function(e) { return self._downIncrement.call(self, e); }); */ + + this.selector = this.picker.find('div.rich-colorPicker-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-colorPicker-rainbow div'); + this.picker.find('div.rich-colorPicker-rainbow').bind('mousedown', function(e) { return self._downHue.call(self, e); }); + + this.newColor = this.picker.find('div.rich-colorPicker-new-color'); + this.currentColor = this.picker.find('div.rich-colorPicker-current-color'); + this.iconColor = $('img.rich-colorPicker-icon'); + + this.picker.find('.rich-colorPicker-submit') + .bind('mouseenter', function(e) { return self._enterSubmit.call(self, e); }) + .bind('mouseleave', function(e) { return self._leaveSubmit.call(self, e); }) + .bind('click', function(e) { return self._clickSubmit.call(self, e); }); + + this.picker.find('.rich-colorPicker-cancel') + .bind('mouseenter', function(e) { return self._enterCancel.call(self, e); }) + .bind('mouseleave', function(e) { return self._leaveCancel.call(self, e); }) + .bind('click', function(e) { return self._clickCancel.call(self, e); }); + + this._fillRGBFields(this.color); + this._fillHSBFields(this.color); + this._fillHexFields(this.color); + this._setHue(this.color); + this._setSelector(this.color); + this._setCurrentColor(this.color); + this._setIconColor(this.color); + this._setNewColor(this.color); + + if (o.flat) { + this.picker.css({ + position: 'relative', + display: 'block' + }); + } else { + $(this.element).bind(this.showEvent+".colorPicker", function(e) { return self._show.call(self, e); }); + } + + }, + + destroy: function() { + + this.picker.remove(); + this.element.removeData("colorPicker").unbind(".colorPicker"); + + }, + + _fillRGBFields: function(hsb) { + var rgb = this._HSBToRGB(hsb); + + this.fields + .eq(1).val(rgb.r).end() + .eq(2).val(rgb.g).end() + .eq(3).val(rgb.b).end(); + }, + _fillHSBFields: function(hsb) { + this.fields + .eq(4).val(hsb.h).end() + .eq(5).val(hsb.s).end() + .eq(6).val(hsb.b).end(); + }, + _fillHexFields: function (hsb) { + this.fields + .eq(0).val(this._HSBToHex(hsb)).end(); + }, + _setSelector: function(hsb) { + this.selector.css('backgroundColor', '#' + this._HSBToHex({h: hsb.h, s: 100, b: 100})); + this.selectorIndic.css({ + left: parseInt(150 * hsb.s/100, 10), + top: parseInt(150 * (100-hsb.b)/100, 10) + }); + }, + _setHue: function(hsb) { + this.hue.css('top', parseInt(150 - 150 * hsb.h/360, 10)); + }, + _setCurrentColor: function(hsb) { + this.currentColor.css('backgroundColor', '#' + this._HSBToHex(hsb)); + }, + _setIconColor: function(hsb) { + this.iconColor.css('backgroundColor', '#' + this._HSBToHex(hsb)); + }, + _setNewColor: function(hsb) { + this.newColor.css('backgroundColor', '#' + this._HSBToHex(hsb)); + }, + _keyDown: function(e) { + var pressedKey = e.charCode || e.keyCode || -1; + if ((pressedKey > this.charMin && pressedKey <= 90) || pressedKey == 32) { + return false; + } + }, + _change: function(e, target) { + + var col; + target = target || e.target; + + if (target.parentNode.className.indexOf('-hex') > 0) { + + col = this._HexToHSB(this.fields.eq(0).val()); + + this.color = col; + this._fillHexFields(col); + this._fillRGBFields(col); + this._fillHSBFields(col); + } else if (target.parentNode.className.indexOf('-hsb') > 0) { + col = this._fixHSB({ + h: parseInt(this.fields.eq(4).val(), 10), + s: parseInt(this.fields.eq(5).val(), 10), + b: parseInt(this.fields.eq(6).val(), 10) + }); + this.color = col; + this._fillHSBFields(col); + this._fillRGBFields(col); + this._fillHexFields(col); + } else { + col = this._RGBToHSB(this._fixRGB({ + r: parseInt(this.fields.eq(1).val(), 10), + g: parseInt(this.fields.eq(2).val(), 10), + b: parseInt(this.fields.eq(3).val(), 10) + })); + this.color = col; + this._fillRGBFields(col); + this._fillHexFields(col); + this._fillHSBFields(col); + } + this._setSelector(col); + this._setHue(col); + this._setNewColor(col); + this._trigger('change', e, { options: this.options, hsb: col, hex: this._HSBToHex(col), rgb: this._HSBToRGB(col) }); + }, + _blur: function(e) { +/* + var col = this.color; + this._fillRGBFields(col); + this._fillHSBFields(col); + this._fillHexFields(col); + this._setHue(col); + this._setSelector(col); + this._setNewColor(col); + this._setIconColor(col); +*/ + this.fields.parent().removeClass('rich-colorPicker-focus'); + + }, + _focus: function(e) { + + this.charMin = e.target.parentNode.className.indexOf('-hex') > 0 ? 70 : 65; + this.fields.parent().removeClass('rich-colorPicker-focus'); + $(e.target.parentNode).addClass('rich-colorPicker-focus'); + + }, +/* + _downIncrement: function(e) { + + var field = $(e.target).parent().find('input').focus(), self = this; + this.currentIncrement = { + el: $(e.target).parent().addClass('ui-colorPicker-slider'), + max: e.target.parentNode.className.indexOf('-hsb-h') > 0 ? 360 : (e.target.parentNode.className.indexOf('-hsb') > 0 ? 100 : 255), + y: e.pageY, + field: field, + val: parseInt(field.val(), 10) + }; + $(document).bind('mouseup.cpSlider', function(e) { return self._upIncrement.call(self, e); }); + $(document).bind('mousemove.cpSlider', function(e) { return self._moveIncrement.call(self, e); }); + return false; + + }, + _moveIncrement: function(e) { + this.currentIncrement.field.val(Math.max(0, Math.min(this.currentIncrement.max, parseInt(this.currentIncrement.val + e.pageY - this.currentIncrement.y, 10)))); + this._change.apply(this, [e, this.currentIncrement.field.get(0)]); + return false; + }, + _upIncrement: function(e) { + this.currentIncrement.el.removeClass('ui-colorPicker-slider').find('input').focus(); + this._change.apply(this, [e, this.currentIncrement.field.get(0)]); + $(document).unbind('mouseup.cpSlider'); + $(document).unbind('mousemove.cpSlider'); + return false; + }, +*/ + _downHue: function(e) { + + this.currentHue = { + y: this.picker.find('div.rich-colorPicker-rainbow').offset().top + }; + + this._change.apply(this, [e, this + .fields + .eq(4) + .val(parseInt(360*(150 - Math.max(0,Math.min(150,(e.pageY - this.currentHue.y))))/150, 10)) + .get(0)]); + + var self = this; + $(document).bind('mouseup.cpSlider', function(e) { return self._upHue.call(self, e); }); + $(document).bind('mousemove.cpSlider', function(e) { return self._moveHue.call(self, e); }); + return false; + + }, + _moveHue: function(e) { + + this._change.apply(this, [e, this + .fields + .eq(4) + .val(parseInt(360*(150 - Math.max(0,Math.min(150,(e.pageY - this.currentHue.y))))/150, 10)) + .get(0)]); + + return false; + + }, + _upHue: function(e) { + $(document).unbind('mouseup.cpSlider'); + $(document).unbind('mousemove.cpSlider'); + return false; + }, + _downSelector: function(e) { + + var self = this; + this.currentSelector = { + pos: this.picker.find('div.rich-colorPicker-color').offset() + }; + + this._change.apply(this, [e, this + .fields + .eq(6) + .val(parseInt(100*(150 - Math.max(0,Math.min(150,(e.pageY - this.currentSelector.pos.top))))/150, 10)) + .end() + .eq(5) + .val(parseInt(100*(Math.max(0,Math.min(150,(e.pageX - this.currentSelector.pos.left))))/150, 10)) + .get(0) + ]); + $(document).bind('mouseup.cpSlider', function(e) { return self._upSelector.call(self, e); }); + $(document).bind('mousemove.cpSlider', function(e) { return self._moveSelector.call(self, e); }); + return false; + + }, + _moveSelector: function(e) { + + this._change.apply(this, [e, this + .fields + .eq(6) + .val(parseInt(100*(150 - Math.max(0,Math.min(150,(e.pageY - this.currentSelector.pos.top))))/150, 10)) + .end() + .eq(5) + .val(parseInt(100*(Math.max(0,Math.min(150,(e.pageX - this.currentSelector.pos.left))))/150, 10)) + .get(0) + ]); + return false; + + }, + _upSelector: function(e) { + $(document).unbind('mouseup.cpSlider'); + $(document).unbind('mousemove.cpSlider'); + return false; + }, + _enterSubmit: function(e) { + this.picker.find('.rich-colorPicker-submit').addClass('rich-colorPicker-focus'); + }, + _leaveSubmit: function(e) { + this.picker.find('.rich-colorPicker-submit').removeClass('rich-colorPicker-focus'); + }, + _enterCancel: function(e) { + this.picker.find('.rich-colorPicker-cancel').addClass('rich-colorPicker-focus'); + }, + _leaveCancel: function(e) { + this.picker.find('.rich-colorPicker-cancel').removeClass('rich-colorPicker-focus'); + }, + _clickSubmit: function(e) { + + var col = this.color; + this.origColor = col; + this._setCurrentColor(col); + this._setIconColor(col); + 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._trigger("submit", e, { options: this.options, hsb: col, hex: this._HSBToHex(col), rgb: this._HSBToRGB(col) }); + this.picker.hide(); + $(document).unbind('mousedown.colorPicker'); + return false; + }, + _clickCancel: function(e) { + this.picker.hide(); + $(document).unbind('mousedown.colorPicker'); + return false; + }, + _show: function(e) { + + this._trigger("beforeShow", e, { options: this.options, hsb: this.color, hex: this._HSBToHex(this.color), rgb: this._HSBToRGB(this.color) }); + + var top = 0; + var left = 0; + var viewPort = this._getWindowScrollOffset(); + var window = this._getWindowDimensions(); + + if(window.height - (this.element.offset().top - viewPort.scrollTop) < this.picker.height()){ + top = this.element[0].offsetTop - this.picker.height(); + }else{ + top = this.element[0].offsetTop + this.element[0].offsetHeight; + } + if(window.width - (this.element.offset().left - viewPort.scrollLeft) < this.picker.width()){ + left = this.element[0].offsetLeft - this.picker.width() + this.element[0].offsetWidth; + }else{ + left = this.element[0].offsetLeft; + } + + this.picker.css({left: left + 'px', top: top + 'px'}); + if (this._trigger("show", e, { options: this.options, hsb: this.color, hex: this._HSBToHex(this.color), rgb: this._HSBToRGB(this.color) }) != false) { + this.picker.show(); + } + + var self = this; + $(document).bind('mousedown.colorPicker', function(e) { return self._hide.call(self, e); }); + return false; + + }, + + _getWindowDimensions: function() { + var w = self.innerWidth + || document.documentElement.clientWidth + || document.body.clientWidth + || 0; + var h = self.innerHeight + || document.documentElement.clientHeight + || document.body.clientHeight + || 0; + return {width:w, height: h}; + }, + + _getWindowScrollOffset: function() { + var x = window.pageXOffset + || document.documentElement.scrollLeft + || document.body.scrollLeft + || 0; + var y = window.pageYOffset + || document.documentElement.scrollTop + || document.body.scrollTop + || 0; + return {scrollLeft:x, scrollTop:y}; + }, + + _hide: function(e) { + + if (!this._isChildOf(this.picker[0], e.target, this.picker[0])) { + if (this._trigger("hide", e, { options: this.options, hsb: this.color, hex: this._HSBToHex(this.color), rgb: this._HSBToRGB(this.color) }) != false) { + this.picker.hide(); + } + $(document).unbind('mousedown.colorPicker'); + } + + }, + _isChildOf: function(parentEl, el, container) { + if (parentEl == el) { + return true; + } + if (parentEl.contains && !$.browser.safari) { + return parentEl.contains(el); + } + if ( parentEl.compareDocumentPosition ) { + return !!(parentEl.compareDocumentPosition(el) & 16); + } + var prEl = el.parentNode; + while(prEl && prEl != container) { + if (prEl == parentEl) + return true; + prEl = prEl.parentNode; + } + return false; + }, +/* + _getScroll: function() { + var t,l,w,h,iw,ih; + if (document.documentElement) { + t = document.documentElement.scrollTop; + l = document.documentElement.scrollLeft; + w = document.documentElement.scrollWidth; + h = document.documentElement.scrollHeight; + } else { + t = document.body.scrollTop; + l = document.body.scrollLeft; + w = document.body.scrollWidth; + h = document.body.scrollHeight; + } + iw = self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth||0; + ih = self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight||0; + return { t: t, l: l, w: w, h: h, iw: iw, ih: ih }; + }, +*/ + _fixHSB: function(hsb) { + return { + h: Math.min(360, Math.max(0, hsb.h)), + s: Math.min(100, Math.max(0, hsb.s)), + b: Math.min(100, Math.max(0, hsb.b)) + }; + }, + _fixRGB: function(rgb) { + return { + r: Math.min(255, Math.max(0, rgb.r)), + g: Math.min(255, Math.max(0, rgb.g)), + b: Math.min(255, Math.max(0, rgb.b)) + }; + }, + _HexToRGB: function (hex) { + var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16); + return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)}; + }, + _HexToHSB: function(hex) { + return this._RGBToHSB(this._HexToRGB(hex)); + }, + _RGBToHSB: function(rgb) { + var hsb = {}; + hsb.b = Math.max(Math.max(rgb.r,rgb.g),rgb.b); + hsb.s = (hsb.b <= 0) ? 0 : Math.round(100*(hsb.b - Math.min(Math.min(rgb.r,rgb.g),rgb.b))/hsb.b); + hsb.b = Math.round((hsb.b /255)*100); + if((rgb.r==rgb.g) && (rgb.g==rgb.b)) hsb.h = 0; + else if(rgb.r>=rgb.g && rgb.g>=rgb.b) hsb.h = 60*(rgb.g-rgb.b)/(rgb.r-rgb.b); + else if(rgb.g>=rgb.r && rgb.r>=rgb.b) hsb.h = 60 + 60*(rgb.g-rgb.r)/(rgb.g-rgb.b); + else if(rgb.g>=rgb.b && rgb.b>=rgb.r) hsb.h = 120 + 60*(rgb.b-rgb.r)/(rgb.g-rgb.r); + else if(rgb.b>=rgb.g && rgb.g>=rgb.r) hsb.h = 180 + 60*(rgb.b-rgb.g)/(rgb.b-rgb.r); + else if(rgb.b>=rgb.r && rgb.r>=rgb.g) hsb.h = 240 + 60*(rgb.r-rgb.g)/(rgb.b-rgb.g); + else if(rgb.r>=rgb.b && rgb.b>=rgb.g) hsb.h = 300 + 60*(rgb.r-rgb.b)/(rgb.r-rgb.g); + else hsb.h = 0; + hsb.h = Math.round(hsb.h); + return hsb; + }, + _HSBToRGB: function(hsb) { + var rgb = {}; + var h = Math.round(hsb.h); + var s = Math.round(hsb.s*255/100); + var v = Math.round(hsb.b*255/100); + if(s == 0) { + rgb.r = rgb.g = rgb.b = v; + } else { + var t1 = v; + var t2 = (255-s)*v/255; + var t3 = (t1-t2)*(h%60)/60; + if(h==360) h = 0; + if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3;} + else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3;} + else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3;} + else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3;} + else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3;} + else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3;} + else {rgb.r=0; rgb.g=0; rgb.b=0;} + } + return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)}; + }, + _RGBToHex: function(rgb) { + var hex = [ + rgb.r.toString(16), + rgb.g.toString(16), + rgb.b.toString(16) + ]; + $.each(hex, function (nr, val) { + if (val.length == 1) { + hex[nr] = '0' + val; + } + }); + return hex.join(''); + }, + _HSBToHex: function(hsb) { + return this._RGBToHex(this._HSBToRGB(hsb)); + }, + setColor: function(col) { + 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; + this.origColor = col; + this._fillRGBFields(col); + this._fillHSBFields(col); + this._fillHexFields(col); + this._setHue(col); + this._setSelector(col); + this._setCurrentColor(col); + this._setIconColor(col); + this._setNewColor(col); + + } + +}); +})(jQuery); Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.colorpicker.js ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.core.js =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.core.js (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.core.js 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,426 @@ +;(function($) { + +/** jQuery core modifications and additions **/ + +var _remove = $.fn.remove; +$.fn.remove = function() { + $("*", this).add(this).triggerHandler("remove"); + return _remove.apply(this, arguments ); +}; + +function isVisible(element) { + function checkStyles(element) { + var style = element.style; + return (style.display != 'none' && style.visibility != 'hidden'); + } + + var visible = checkStyles(element); + + (visible && $.each($.dir(element, 'parentNode'), function() { + return (visible = checkStyles(this)); + })); + + return visible; +} + +$.extend($.expr[':'], { + data: function(a, i, m) { + return $.data(a, m[3]); + }, + + // TODO: add support for object, area + tabbable: function(a, i, m) { + var nodeName = a.nodeName.toLowerCase(); + + return ( + // in tab order + a.tabIndex >= 0 && + + ( // filter node types that participate in the tab order + + // anchor tag + ('a' == nodeName && a.href) || + + // enabled form element + (/input|select|textarea|button/.test(nodeName) && + 'hidden' != a.type && !a.disabled) + ) && + + // visible on page + isVisible(a) + ); + } +}); + +$.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, + NUMPAD_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 +}; + +// $.widget is a factory to create jQuery plugins +// taking some boilerplate code out of the plugin code +// created by Scott González and Jörn Zaefferer +function getter(namespace, plugin, method, args) { + function getMethods(type) { + var methods = $[namespace][plugin][type] || []; + return (typeof methods == 'string' ? methods.split(/,?\s+/) : methods); + } + + var methods = getMethods('getter'); + if (args.length == 1 && typeof args[0] == 'string') { + methods = methods.concat(getMethods('getterSetter')); + } + return ($.inArray(method, methods) != -1); +} + +$.widget = function(name, prototype) { + var namespace = name.split(".")[0]; + name = name.split(".")[1]; + + // create plugin method + $.fn[name] = function(options) { + var isMethodCall = (typeof options == 'string'), + args = Array.prototype.slice.call(arguments, 1); + + // prevent calls to internal methods + if (isMethodCall && options.substring(0, 1) == '_') { + return this; + } + + // handle getter methods + if (isMethodCall && getter(namespace, name, options, args)) { + var instance = $.data(this[0], name); + return (instance ? instance[options].apply(instance, args) + : undefined); + } + + // handle initialization and non-getter methods + return this.each(function() { + var instance = $.data(this, name); + + // constructor + (!instance && !isMethodCall && + $.data(this, name, new $[namespace][name](this, options))); + + // method call + (instance && isMethodCall && $.isFunction(instance[options]) && + instance[options].apply(instance, args)); + }); + }; + + // create widget constructor + $[namespace][name] = function(element, options) { + var self = this; + + this.widgetName = name; + this.widgetEventPrefix = $[namespace][name].eventPrefix || name; + this.widgetBaseClass = namespace + '-' + name; + + this.options = $.extend({}, + $.widget.defaults, + $[namespace][name].defaults, + $.metadata && $.metadata.get(element)[name], + options); + + this.element = $(element) + .bind('setData.' + name, function(e, key, value) { + return self._setData(key, value); + }) + .bind('getData.' + name, function(e, key) { + return self._getData(key); + }) + .bind('remove', function() { + return self.destroy(); + }); + + this._init(); + }; + + // add widget prototype + $[namespace][name].prototype = $.extend({}, $.widget.prototype, prototype); + + // TODO: merge getter and getterSetter properties from widget prototype + // and plugin prototype + $[namespace][name].getterSetter = 'option'; +}; + +$.widget.prototype = { + _init: function() {}, + destroy: function() { + this.element.removeData(this.widgetName); + }, + + option: function(key, value) { + var options = key, + self = this; + + if (typeof key == "string") { + if (value === undefined) { + return this._getData(key); + } + options = {}; + options[key] = value; + } + + $.each(options, function(key, value) { + self._setData(key, value); + }); + }, + _getData: function(key) { + return this.options[key]; + }, + _setData: function(key, value) { + this.options[key] = value; + + if (key == 'disabled') { + this.element[value ? 'addClass' : 'removeClass']( + this.widgetBaseClass + '-disabled'); + } + }, + + enable: function() { + this._setData('disabled', false); + }, + disable: function() { + this._setData('disabled', true); + }, + + _trigger: function(type, e, data) { + var eventName = (type == this.widgetEventPrefix + ? type : this.widgetEventPrefix + type); + e = e || $.event.fix({ type: eventName, target: this.element[0] }); + return this.element.triggerHandler(eventName, [e, data], this.options[type]); + } +}; + +$.widget.defaults = { + disabled: false +}; + + +/** jQuery UI core **/ + +$.ui = { + plugin: { + add: function(module, option, set) { + var proto = $.ui[module].prototype; + for(var i in set) { + proto.plugins[i] = proto.plugins[i] || []; + proto.plugins[i].push([option, set[i]]); + } + }, + call: function(instance, name, args) { + var set = instance.plugins[name]; + if(!set) { return; } + + for (var i = 0; i < set.length; i++) { + if (instance.options[set[i][0]]) { + set[i][1].apply(instance.element, args); + } + } + } + }, + cssCache: {}, + css: function(name) { + if ($.ui.cssCache[name]) { return $.ui.cssCache[name]; } + var tmp = $('<div class="ui-gen">').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body'); + + //if (!$.browser.safari) + //tmp.appendTo('body'); + + //Opera and Safari set width and height to 0px instead of auto + //Safari returns rgba(0,0,0,0) when bgcolor is not set + $.ui.cssCache[name] = !!( + (!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) || + !(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba$0, 0, 0, 0$/).test(tmp.css('backgroundColor'))) + ); + try { $('body').get(0).removeChild(tmp.get(0)); } catch(e){} + return $.ui.cssCache[name]; + }, + disableSelection: function(el) { + return $(el) + .attr('unselectable', 'on') + .css('MozUserSelect', 'none') + .bind('selectstart.ui', function() { return false; }); + }, + enableSelection: function(el) { + return $(el) + .attr('unselectable', 'off') + .css('MozUserSelect', '') + .unbind('selectstart.ui'); + }, + hasScroll: function(e, a) { + + //If overflow is hidden, the element might have extra content, but the user wants to hide it + if ($(e).css('overflow') == 'hidden') { return false; } + + var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop', + has = false; + + if (e[scroll] > 0) { return true; } + + // TODO: determine which cases actually cause this to happen + // if the element doesn't have the scroll set, see if it's possible to + // set the scroll + e[scroll] = 1; + has = (e[scroll] > 0); + e[scroll] = 0; + return has; + } +}; + + +/** Mouse Interaction Plugin **/ + +$.ui.mouse = { + _mouseInit: function() { + var self = this; + + this.element.bind('mousedown.'+this.widgetName, function(e) { + return self._mouseDown(e); + }); + + // Prevent text selection in IE + if ($.browser.msie) { + this._mouseUnselectable = this.element.attr('unselectable'); + this.element.attr('unselectable', 'on'); + } + + this.started = false; + }, + + // TODO: make sure destroying one instance of mouse doesn't mess with + // other instances of mouse + _mouseDestroy: function() { + this.element.unbind('.'+this.widgetName); + + // Restore text selection in IE + ($.browser.msie + && this.element.attr('unselectable', this._mouseUnselectable)); + }, + + _mouseDown: function(e) { + // we may have missed mouseup (out of window) + (this._mouseStarted && this._mouseUp(e)); + + this._mouseDownEvent = e; + + var self = this, + btnIsLeft = (e.which == 1), + elIsCancel = (typeof this.options.cancel == "string" ? $(e.target).parents().add(e.target).filter(this.options.cancel).length : false); + if (!btnIsLeft || elIsCancel || !this._mouseCapture(e)) { + return true; + } + + this.mouseDelayMet = !this.options.delay; + if (!this.mouseDelayMet) { + this._mouseDelayTimer = setTimeout(function() { + self.mouseDelayMet = true; + }, this.options.delay); + } + + if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) { + this._mouseStarted = (this._mouseStart(e) !== false); + if (!this._mouseStarted) { + e.preventDefault(); + return true; + } + } + + // these delegates are required to keep context + this._mouseMoveDelegate = function(e) { + return self._mouseMove(e); + }; + this._mouseUpDelegate = function(e) { + return self._mouseUp(e); + }; + $(document) + .bind('mousemove.'+this.widgetName, this._mouseMoveDelegate) + .bind('mouseup.'+this.widgetName, this._mouseUpDelegate); + + return false; + }, + + _mouseMove: function(e) { + // IE mouseup check - mouseup happened when mouse was out of window + if ($.browser.msie && !e.button) { + return this._mouseUp(e); + } + + if (this._mouseStarted) { + this._mouseDrag(e); + return false; + } + + if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) { + this._mouseStarted = + (this._mouseStart(this._mouseDownEvent, e) !== false); + (this._mouseStarted ? this._mouseDrag(e) : this._mouseUp(e)); + } + + return !this._mouseStarted; + }, + + _mouseUp: function(e) { + $(document) + .unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate) + .unbind('mouseup.'+this.widgetName, this._mouseUpDelegate); + + if (this._mouseStarted) { + this._mouseStarted = false; + this._mouseStop(e); + } + + return false; + }, + + _mouseDistanceMet: function(e) { + return (Math.max( + Math.abs(this._mouseDownEvent.pageX - e.pageX), + Math.abs(this._mouseDownEvent.pageY - e.pageY) + ) >= this.options.distance + ); + }, + + _mouseDelayMet: function(e) { + return this.mouseDelayMet; + }, + + // These are placeholder methods, to be overriden by extending plugin + _mouseStart: function(e) {}, + _mouseDrag: function(e) {}, + _mouseStop: function(e) {}, + _mouseCapture: function(e) { return true; } +}; + +$.ui.mouse.defaults = { + cancel: null, + distance: 1, + delay: 0 +}; + +})(jQuery); Property changes on: trunk/sandbox/ui/colorPicker/src/main/resources/org/richfaces/ui/renderkit/html/scripts/ui.core.js ___________________________________________________________________ Name: svn:executable + * Added: trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx =================================================================== --- trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx (rev 0) +++ trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx 2009-01-16 23:11:57 UTC (rev 12320) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + xmlns:h=" http://ajax4jsf.org/cdk/h" + class="org.richfaces.ui.renderkit.html.ColorPickerRenderer" + baseclass="org.richfaces.ui.renderkit.ColorPickerRendererBase" + component="org.richfaces.ui.component.UIColorPicker" + > + <f:clientid var="clientId"/> + <h:scripts>/org/richfaces/ui/renderkit/html/scripts/jquery-1.2.6.js, /org/richfaces/ui/renderkit/html/scripts/pngFix.js, /org/richfaces/ui/renderkit/html/scripts/ui.core.js, /org/richfaces/ui/renderkit/html/scripts/ui.colorpicker.js</h:scripts> + <h:styles>/org/richfaces/ui/renderkit/html/css/colorPicker.xcss</h:styles> + <f:resource name="/org/richfaces/ui/renderkit/html/images/arrow.gif" var="arrow" /> + <f:resource name="/org/richfaces/ui/renderkit/html/images/rainbow.png" var="rainbow" /> + + <c:object var="showEvent" type="java.lang.String" /> + <c:object var="clientIdJquery" type="java.lang.String" /> + + + <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"); + showEvent = (String) component.getAttributes().get("showEvent"); + if(showEvent.startsWith("on")){ + showEvent = showEvent.substring(2); + } + clientIdJquery = convertToString(clientId); + clientIdJquery = clientIdJquery.replace(":", "\\\\:"); + ]]></jsp:scriptlet> + $('#{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); + } + }); + }); + </script> + </div> + <span id="#{clientId}colorPicker" class="rich-colorPicker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style"> + <input readonly="readonly" type="text" /> + <jsp:scriptlet> + <![CDATA[if(component.getFacet("icon")!=null && component.getFacet("icon").isRendered()) {]]> + </jsp:scriptlet> + <u:insertFacet name="icon" /> + <jsp:scriptlet> + <![CDATA[ + }else{ + ]]> + </jsp:scriptlet> + <img src="#{arrow}" class="rich-colorPicker-icon #{component.attributes['iconClass']}" style="#{component.attributes['iconStyle']}" vertical-align="middle"/> + <jsp:scriptlet> + <![CDATA[ + } + ]]> + </jsp:scriptlet> + </span> + +<div id="#{clientId}colorPicker-popup" class="rich-colorPicker-wrapper"> + <div class="rich-colorPicker-ext"> + <div class="rich-colorPicker-color"> + <div> + <div></div> + </div> + </div> + <div class="rich-colorPicker-rainbow"> + <img src="#{rainbow}" alt="rainbow" /> + <div></div> + </div> + <div class="rich-colorPicker-new-color"></div> + <div class="rich-colorPicker-current-color"></div> + <div class="rich-colorPicker-hex-wrapper"> + <label for="rich-colorPicker-hex-wrapper" title="hex">#:</label> + <input id="#{clientId}-colorPicker-hex" type="text" maxlength="6" size="6" /> + </div> + <div class="rich-colorPicker-rgb-wrapper rich-colorPicker-rgb-r"> + <label for="rgb">R:</label> + <input id="#{clientId}-colorPicker-rgb-r" type="text" maxlength="3" size="2" /> + </div> + <div class="rich-colorPicker-rgb-wrapper rich-colorPicker-rgb-g"> + <label for="rgb-g">G:</label> + <input id="#{clientId}-colorPicker-rgb-g" type="text" maxlength="3" size="2" /> + </div> + <div class="rich-colorPicker-rgb-wrapper rich-colorPicker-rgb-b"> + <label for="rgb-b">B:</label> + <input id="#{clientId}-colorPicker-rgb-b" type="text" maxlength="3" size="2" /> + </div> + <div class="rich-colorPicker-hsb-h rich-colorPicker-hsb-wrapper"> + <label for="hsb-h">H:</label> + <input id="#{clientId}-colorPicker-hsb-h" type="text" maxlength="3" size="2" /> + </div> + <div class="rich-colorPicker-hsb-s rich-colorPicker-hsb-wrapper"> + <label for="hsb-s">S:</label> + <input id="#{clientId}-colorPicker-hsb-s" type="text" maxlength="3" size="2" /> + </div> + <div class="rich-colorPicker-hsb-b rich-colorPicker-hsb-wrapper"> + <label for="hsb-b">B:</label> + <input id="#{clientId}-colorPicker-hsb-b" type="text" maxlength="3" size="2" /> + </div> + <button type="button" class="rich-colorPicker-submit" name="submit">Apply</button> + <button type="button" class="rich-colorPicker-cancel" name="cancel">Cancel</button> + </div> +</div> +</f:root> Property changes on: trunk/sandbox/ui/colorPicker/src/main/templates/org/richfaces/ui/htmlColorPicker.jspx ___________________________________________________________________ Name: svn:executable + *

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12319 - trunk/ui/orderingList/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-01-16 14:24:27 -0500 (Fri, 16 Jan 2009) New Revision: 12319 Modified: trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java Log: https://jira.jboss.org/jira/browse/RF-5772 Modified: trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-01-16 19:12:25 UTC (rev 12318) +++ trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-01-16 19:24:27 UTC (rev 12319) @@ -529,7 +529,7 @@ } private Converter getConverterForType(FacesContext context, Class type) { - if (!Object.class.equals(type)) { + if (!Object.class.equals(type) && type != null) { Application application = context.getApplication(); return application.createConverter(type); }

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12318 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/treeNodesAdaptor and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2009-01-16 14:12:25 -0500 (Fri, 16 Jan 2009) New Revision: 12318 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeNodesAdaptorTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java Log: RF-5583 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeNodesAdaptorTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeNodesAdaptorTestBean.java 2009-01-16 16:47:48 UTC (rev 12317) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeNodesAdaptorTestBean.java 2009-01-16 19:12:25 UTC (rev 12318) @@ -48,21 +48,27 @@ private List<Node> nodes; private String trace; + private Boolean ajaxSingle; public TreeNodesAdaptorTestBean() { init(); } public void init() { - trace = ""; nodes = new ArrayList<Node>(3); for (int i = 1; i <= 3; i++) { Node node = new Node(Integer.toString(i)); nodes.add(node); for (int j = 1; j <= 3; j++) { - node.addChild(new Node(Integer.toString(i * 10 + j))); + Node node2 = new Node(Integer.toString(i * 10 + j)); + node.addChild(node2); + for (int k = 1; k <= 3; k++) { + node2.addChild(new Node(Integer.toString(i * 100 + j * 10 + k))); + } } } + trace = ""; + ajaxSingle = false; } public void submit(ActionEvent event) { @@ -84,4 +90,12 @@ public List<Node> getNodes() { return nodes; } + + public void setAjaxSingle(Boolean ajaxSingle) { + this.ajaxSingle = ajaxSingle; + } + + public Boolean getAjaxSingle() { + return ajaxSingle; + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml 2009-01-16 16:47:48 UTC (rev 12317) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/treeNodesAdaptor/treeNodesAdaptor.xhtml 2009-01-16 19:12:25 UTC (rev 12318) @@ -8,29 +8,42 @@ <ui:composition template="#{templateBean.template}"> <ui:define name="component"> + <h:form id="attrForm"> + <h:outputText value="ajaxSingle" /> + <h:selectBooleanCheckbox id="ajaxSingle" value="#{treeNodesAdaptor.ajaxSingle}"> + <a4j:support event="onchange" reRender="tree"/> + </h:selectBooleanCheckbox> + </h:form> <h:form id="mainForm"> <rich:tree id="tree"> <rich:treeNodesAdaptor nodes="#{treeNodesAdaptor.nodes}" var="node"> <rich:treeNode> <h:outputText value="#{node.id}"></h:outputText> <h:commandButton id="submit" value="submit" actionListener="#{treeNodesAdaptor.submit}"></h:commandButton> - <a4j:commandButton id="ajaxSubmit" value="ajaxSubmit" reRender="outputText, dataTable" actionListener="#{treeNodesAdaptor.submit}"></a4j:commandButton> - <a4j:commandButton id="ajaxSingleSubmit" value="ajaxSingleSubmit" reRender="outputText, dataTable" actionListener="#{treeNodesAdaptor.submit}" ajaxSingle="true"></a4j:commandButton> + <a4j:commandButton id="ajaxSubmit" value="ajaxSubmit" actionListener="#{treeNodesAdaptor.submit}"></a4j:commandButton> + <a4j:commandButton id="ajaxSingleSubmit" value="ajaxSingleSubmit" actionListener="#{treeNodesAdaptor.submit}" ajaxSingle="true"></a4j:commandButton> </rich:treeNode> <rich:treeNodesAdaptor nodes="#{node.children}" var="child"> - <rich:treeNode> + <rich:treeNode ajaxSingle="#{treeNodesAdaptor.ajaxSingle}"> <h:inputText value="#{child.id}"></h:inputText> </rich:treeNode> + <rich:treeNodesAdaptor nodes="#{child.children}" var="child2"> + <rich:treeNode> + <h:outputText value="#{child2.id}"></h:outputText> + </rich:treeNode> + </rich:treeNodesAdaptor> </rich:treeNodesAdaptor> </rich:treeNodesAdaptor> </rich:tree> </h:form> - <h:outputText id="outputText" value="#{treeNodesAdaptor.trace}"></h:outputText> - <h:dataTable id="dataTable" value="#{treeNodesAdaptor.nodes[1].children}" var="child"> - <h:column> - <h:outputText value="#{child.id}"></h:outputText> - </h:column> - </h:dataTable> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText id="outputText" value="#{treeNodesAdaptor.trace}"></h:outputText> + <h:dataTable id="dataTable" value="#{treeNodesAdaptor.nodes[1].children}" var="child"> + <h:column> + <h:outputText value="#{child.id}"></h:outputText> + </h:column> + </h:dataTable> + </a4j:outputPanel> </ui:define> </ui:composition> </html> \ No newline at end of file Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java 2009-01-16 16:47:48 UTC (rev 12317) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeNodesAdaptorTest.java 2009-01-16 19:12:25 UTC (rev 12318) @@ -34,6 +34,8 @@ private List<Node> nodes; + private String ajaxSingle; + private String tree; private String outputText; @@ -45,9 +47,15 @@ Node node = new Node(Integer.toString(i)); nodes.add(node); for (int j = 1; j <= 3; j++) { - node.addChild(new Node(Integer.toString(i * 10 + j))); + Node node2 = new Node(Integer.toString(i * 10 + j)); + node.addChild(node2); + for (int k = 1; k <= 3; k++) { + node2.addChild(new Node(Integer.toString(i * 100 + j * 10 + k))); + } } } + String attrForm = getParentId() + "attrForm"; + ajaxSingle = attrForm + ":ajaxSingle"; String mainForm = getParentId() + "mainForm"; tree = mainForm + ":tree"; outputText = getParentId() + "outputText"; @@ -75,15 +83,19 @@ } } - private void checkModel(String nodesLocator) { + private void checkModel(String nodesLocator, boolean ajaxSingle) { String dataTableLocator = "xpath=id('"+ dataTable + "')/tbody/tr["; for (int j = 1; j <= 3; j++) { - Assert.assertEquals(selenium.getValue(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input"), selenium.getText(dataTableLocator + j + "]")); - } + if (ajaxSingle && j == 2) { + Assert.assertFalse(selenium.getValue(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input").equals(selenium.getText(dataTableLocator + j + "]"))); + } else { + Assert.assertEquals(selenium.getValue(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input"), selenium.getText(dataTableLocator + j + "]")); + } + } } /** - * check input and command components processing + * check input and command components processing with ajaxSingle nodes */ @Test public void testComponentsProcessing(Template template) { @@ -92,15 +104,22 @@ String titleLocator = locator + "/table[2]/tbody/tr"; clickAjaxCommandAndWait(titleLocator + "/td[1]/div/a"); String nodesLocator = locator + "/div[2]"; - checkModel(nodesLocator); + checkModel(nodesLocator, false); for (int j = 1; j <= 3; j++) { selenium.type(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input", "abc" + j); } + clickAjaxCommandAndWait(nodesLocator + "/table[1]/tbody/tr/td[1]/div/a"); + checkModel(nodesLocator, false); + clickAjaxCommandAndWait(ajaxSingle); + for (int j = 1; j <= 3; j++) { + selenium.type(nodesLocator + "/table[" + j + "]/tbody/tr/td[3]/input", "xyz" + j); + } + clickAjaxCommandAndWait(nodesLocator + "/table[1]/tbody/tr/td[1]/div/a"); + checkModel(nodesLocator, true); String buttonLocator = titleLocator + "/td[3]/input["; Assert.assertEquals(selenium.getText(outputText), ""); selenium.click(buttonLocator + "1]"); waitForPageToLoad(); - checkModel(nodesLocator); Assert.assertTrue(selenium.getText(outputText).endsWith("1::submit")); selenium.click(buttonLocator + "2]"); waitForAjaxCompletion();

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12317 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

by richfaces-svn-commits＠lists.jboss.org

Author: dsvyatobatsko Date: 2009-01-16 11:47:48 -0500 (Fri, 16 Jan 2009) New Revision: 12317 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java Log: https://jira.jboss.org/jira/browse/RF-5565 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-16 16:12:28 UTC (rev 12316) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-16 16:47:48 UTC (rev 12317) @@ -127,6 +127,14 @@ } @Test + public void testOncomplete(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, INIT_AJAX_CORE_TEST); + writeStatus("Test oncomplete attribute"); + tester.testOncomplete(); + } + + @Test public void testSubmissionModesAndListeners(Template template) { renderPage(template, RESET_METHOD);

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12316 - trunk/test-applications/jsp/src/main/webapp/OrderingList.

by richfaces-svn-commits＠lists.jboss.org

Author: mvitenkov Date: 2009-01-16 11:12:28 -0500 (Fri, 16 Jan 2009) New Revision: 12316 Modified: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp Log: remove findComponent Modified: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp 2009-01-16 16:07:22 UTC (rev 12315) +++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp 2009-01-16 16:12:28 UTC (rev 12316) @@ -91,15 +91,5 @@ onclick="submit();"> </h:selectBooleanCheckbox> </h:panelGrid> - <br /> - <br /> - <div style="FONT-WEIGHT: bold;">rich:findComponent</div> - <h:panelGrid columns="2"> - <rich:column> - <a4j:commandLink value="getActiveItem" reRender="findID"></a4j:commandLink> - </rich:column> - <rich:column id="findID"> - <h:outputText value="#{rich:findComponent('orderingListID').activeItem}" /> - </rich:column> - </h:panelGrid> + </f:subview> \ No newline at end of file

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12315 - trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean.

by richfaces-svn-commits＠lists.jboss.org

Author: dsvyatobatsko Date: 2009-01-16 11:07:22 -0500 (Fri, 16 Jan 2009) New Revision: 12315 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java Log: fix TemplateBean#reset Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2009-01-16 15:42:17 UTC (rev 12314) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2009-01-16 16:07:22 UTC (rev 12315) @@ -121,7 +121,7 @@ public void reset(ActionEvent actionEvent) { FacesContext context = FacesContext.getCurrentInstance(); if (context != null) { - if (methodName != null && methodName.trim().length() > 0) { + if (methodName != null && methodName.trim().length() > 0 && !"null".equals(methodName)) { try { ExpressionFactory factory = context.getApplication() .getExpressionFactory();

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12314 - trunk/docs/userguide/en/src/main/docbook/modules.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2009-01-16 10:42:17 -0500 (Fri, 16 Jan 2009) New Revision: 12314 Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml Log: https://jira.jboss.org/jira/browse/RF-5738 - Chrome browser support Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml 2009-01-16 15:24:42 UTC (rev 12313) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml 2009-01-16 15:42:17 UTC (rev 12314) @@ -133,6 +133,9 @@ <listitem><para>Safari 2.0-3.1</para></listitem> + <listitem><para>Chrome</para></listitem> + + </itemizedlist> <note>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r12313 - in trunk/ui: dropdown-menu/src/main/config/component and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2009-01-16 10:24:42 -0500 (Fri, 16 Jan 2009) New Revision: 12313 Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml trunk/ui/modal-panel/src/main/config/component/modalPanel.xml trunk/ui/panelbar/src/main/config/component/panelbar.xml trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml trunk/ui/tabPanel/src/main/config/component/tabPanel.xml Log: https://jira.jboss.org/jira/browse/RF-5747 - Grammatical errors in the description of attributes for modalPanel component Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml =================================================================== --- trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-01-16 15:11:15 UTC (rev 12312) +++ trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-01-16 15:24:42 UTC (rev 12313) @@ -214,7 +214,7 @@ <name>oncollapse</name> <classname>java.lang.String</classname> <description> - Event must occurs on menu closure + Event must occur on menu closure </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> @@ -223,7 +223,7 @@ <name>onexpand</name> <classname>java.lang.String</classname> <description> - Event must occurs on menu opening + Event must occur on menu opening </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> Modified: trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml =================================================================== --- trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-01-16 15:11:15 UTC (rev 12312) +++ trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-01-16 15:24:42 UTC (rev 12313) @@ -230,7 +230,7 @@ <name>oncollapse</name> <classname>java.lang.String</classname> <description> - Event must occurs on menu closure + Event must occur on menu closure </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> @@ -239,7 +239,7 @@ <name>onexpand</name> <classname>java.lang.String</classname> <description> - Event must occurs on menu opening + Event must occur on menu opening </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml =================================================================== --- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-01-16 15:11:15 UTC (rev 12312) +++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-01-16 15:24:42 UTC (rev 12313) @@ -116,41 +116,41 @@ <property> <name>onshow</name> <classname>java.lang.String</classname> - <description> Event must occurs after panel opened </description> + <description> Event must occur after panel opened </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>onhide</name> <classname>java.lang.String</classname> - <description> Event must occurs after panel closed </description> + <description> Event must occur after panel closed </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>onmove</name> <classname>java.lang.String</classname> - <description> Event must occurs before panel is moving </description> + <description> Event must occur before panel is moving </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>onbeforeshow</name> <classname>java.lang.String</classname> - <description> Event must occurs before panel is opening </description> + <description> Event must occur before panel is opening </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>onbeforehide</name> <classname>java.lang.String</classname> - <description> Event must occurs before panel is hiding </description> + <description> Event must occur before panel is hiding </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>onresize</name> <classname>java.lang.String</classname> - <description>Event must occurs than panel is resizing </description> + <description>Event must occur than panel is resizing </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> Modified: trunk/ui/panelbar/src/main/config/component/panelbar.xml =================================================================== --- trunk/ui/panelbar/src/main/config/component/panelbar.xml 2009-01-16 15:11:15 UTC (rev 12312) +++ trunk/ui/panelbar/src/main/config/component/panelbar.xml 2009-01-16 15:24:42 UTC (rev 12313) @@ -121,7 +121,7 @@ <name>onitemchange</name> <classname>java.lang.String</classname> <description> - Event must occurs on than item has been changed + Event must occur on than item has been changed </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> @@ -129,7 +129,7 @@ <name>onmouseover</name> <classname>java.lang.String</classname> <description> - Event must occurs on than item has been changed + Event must occur on than item has been changed </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> @@ -137,7 +137,7 @@ <name>onmouseout</name> <classname>java.lang.String</classname> <description> - Event must occurs on than item has been changed + Event must occur on than item has been changed </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> @@ -145,7 +145,7 @@ <name>onmousemove</name> <classname>java.lang.String</classname> <description> - Event must occurs on than item has been changed + Event must occur on than item has been changed </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> @@ -233,7 +233,7 @@ <name>onenter</name> <classname>java.lang.String</classname> <description> - Event must occurs on than item has been entered + Event must occur on than item has been entered </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> @@ -242,7 +242,7 @@ <name>onleave</name> <classname>java.lang.String</classname> <description> - Event must occurs on than item has been leaved + Event must occur on than item has been leaved </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> Modified: trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml =================================================================== --- trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml 2009-01-16 15:11:15 UTC (rev 12312) +++ trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml 2009-01-16 15:24:42 UTC (rev 12313) @@ -104,14 +104,14 @@ <property> <name>onexpand</name> <classname>java.lang.String</classname> - <description> Event must occurs on befor panel expanded</description> + <description> Event must occur on befor panel expanded</description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> <property> <name>oncollapse</name> <classname>java.lang.String</classname> - <description> Event must occurs on befor panel collapsed</description> + <description> Event must occur on befor panel collapsed</description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> </component> Modified: trunk/ui/tabPanel/src/main/config/component/tabPanel.xml =================================================================== --- trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2009-01-16 15:11:15 UTC (rev 12312) +++ trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2009-01-16 15:24:42 UTC (rev 12313) @@ -233,7 +233,7 @@ <name>ontableave</name> <classname>java.lang.String</classname> <description> - Event must occurs on the tab which has been left + Event must occur on the tab which has been left </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property>

16 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits January 2009