September 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r19355 - in trunk/examples/input-demo/src/main/webapp: resources/tests and 1 other directory.

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

Author: pyaschenko Date: 2010-09-28 12:43:40 -0400 (Tue, 28 Sep 2010) New Revision: 19355 Modified: trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js Log: https://jira.jboss.org/browse/RF-9071 Modified: trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml 2010-09-28 15:28:52 UTC (rev 19354) +++ trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml 2010-09-28 16:43:40 UTC (rev 19355) @@ -30,8 +30,20 @@ <p>Page</p> <h:form id="form"> - <input:autocomplete id="myAutocomplete" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" showButton="true"> + <input:autocomplete id="autocompleteDefault" value="a" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country"> #{country.name} #{country.iso} #{country.domain} + </input:autocomplete><br /> + <input:autocomplete id="autocompleteClientMode" mode="client" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" showButton="true"> + #{country.name} #{country.iso} #{country.domain} + </input:autocomplete><br /> + <input:autocomplete id="autocompleteLazyClientMode" mode="lazyClient" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" showButton="true"> + #{country.name} #{country.iso} #{country.domain} + </input:autocomplete><br /> + <input:autocomplete id="autocompleteAjaxMode" mode="ajax" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" showButton="true"> + #{country.name} #{country.iso} #{country.domain} + </input:autocomplete><br /> + <input:autocomplete id="autocompleteCachedAjaxMode" mode="cachedAjax" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" showButton="true"> + #{country.name} #{country.iso} #{country.domain} </input:autocomplete> </h:form> Modified: trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js =================================================================== --- trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js 2010-09-28 15:28:52 UTC (rev 19354) +++ trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js 2010-09-28 16:43:40 UTC (rev 19355) @@ -23,31 +23,68 @@ RichFaces.QUnit.run(function() { module("richfaces-autocomplete"); - var AUTOCOMPLETE_ID = "form:myAutocomplete"; + var AUTOCOMPLETE_ID = "form:autocomplete"; test("RichFaces.ui.Autocomplete constructor test", function () { - var c = RichFaces.$(AUTOCOMPLETE_ID); + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); ok(c instanceof RichFaces.ui.AutocompleteBase, "inctance of RichFaces.ui.AutocompleteBase"); ok(c instanceof RichFaces.ui.Autocomplete, "inctance of RichFaces.ui.Autocomplete"); - equals(c.id, AUTOCOMPLETE_ID, "id"); - // TODO other params - + equals(c.name, "Autocomplete", "name"); + equals(c.id, AUTOCOMPLETE_ID+'Default', "id"); + // test default options + equals(c.options.selectedItemClass, 'rf-au-sel', "options.selectedItemClass"); + equals(c.options.itemClass, 'rf-au-opt', "options.itemClass"); + equals(c.options.autofill, true, "options.autofill"); + equals(c.options.minChars, 1, "options.minChars"); + equals(c.options.selectFirst, true, "options.selectFirst"); + equals(c.options.ajaxMode, true, "options.ajaxMode"); + equals(c.options.lazyClientMode, false, "options.lazyClientMode"); + equals(c.options.isCachedAjax, true, "options.isCachedAjax"); + equals(c.options.tokens, "", "options.tokens"); + equals(c.options.attachToBody, true, "options.attachToBody"); + equals(c.options.filterFunction, undefined, "options.filterFunction"); }); - -/* - test("RichFaces.ui.Tab test public api", function () { - var c = RichFaces.$(TAB_ID); - - var PUBLIC_API = []; - - for (var i in PUBLIC_API) { - var funcName = PUBLIC_API[i]; - ok(c.[funcName], funcName + "present in component"); - // TODO check other functions + check is it function + + test("RichFaces.ui.Autocomplete client api function's", function () { + var CLIENT_API_BASE = ['show','hide','getNamespace','getInputValue','setInputValue']; + var CLIENT_API = []; + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + var fn = ""; + for (var i=0; i<CLIENT_API_BASE.length; i++) { + fn = CLIENT_API_BASE[i]; + ok(typeof c[fn] == "function", fn+" present in component"); } }); + + test("RichFaces.ui.Autocomplete client api: show/hide [attachToDom=true]", function () { + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + var e = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultList'); + equals(e.parentNode.tagName.toLowerCase(), "div", "before show list attached to"); + equals($(e).css("display"), "none", "list style.display"); + c.show(); + e = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultList'); + equals(e.parentNode.tagName.toLowerCase(), "body", "after show list attached to"); + equals(e.style.display, "block", "list style.display"); + c.hide(); + e = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultList'); + equals(e.parentNode.tagName.toLowerCase(), "div", "after hide list attached to"); + equals(e.style.display, "none", "list style.display"); + }); + + test("RichFaces.ui.Autocomplete client api: getNamespace", function () { + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + equals(c.getNamespace(), '.'+RichFaces.Event.createNamespace(c.name, AUTOCOMPLETE_ID+'Default'), "getNamespace"); + }); + + test("RichFaces.ui.Autocomplete client api: getInputValue / setInputValue", function () { + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + equals(c.getInputValue(), 'a', "getInputValue"); + c.setInputValue("b"); + equals(c.getInputValue(), 'b', "getInputValue after setInputValue"); + }); +/* test("RichFaces.ui.Tab test events", function () { var componentId = TAB_ID; var c = RichFaces.$(componentId);

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19354 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.

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

Author: pyaschenko Date: 2010-09-28 11:28:52 -0400 (Tue, 28 Sep 2010) New Revision: 19354 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js Log: small namespace fix Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2010-09-28 12:00:57 UTC (rev 19353) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2010-09-28 15:28:52 UTC (rev 19354) @@ -94,7 +94,7 @@ rf.ui = rf.ui || {}; // Constructor definition rf.ui.Autocomplete = function(componentId, fieldId, options) { - this.namespace = "."+rf.Event.createNamespace(this.name, this.id); + this.namespace = "."+rf.Event.createNamespace(this.name, componentId); this.options = {}; // call constructor of parent class $super.constructor.call(this, componentId, componentId+ID.SELECT, fieldId, options);

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19353 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.

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

Author: konstantin.mishin Date: 2010-09-28 08:00:57 -0400 (Tue, 28 Sep 2010) New Revision: 19353 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js Log: RF-9277 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-09-28 05:57:06 UTC (rev 19352) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-09-28 12:00:57 UTC (rev 19353) @@ -46,7 +46,8 @@ this.handle = this.track.children(".rf-insl-hnd, .rf-insl-hnd-dis"); this.tooltip = this.element.children(".rf-insl-tt"); - this.__inputHandler(); + var proxy = jQuery.proxy(this.__inputHandler, this); + jQuery(document).ready(proxy); if (!this.disabled) { this.decreaseButton = this.element.children(".rf-insl-dec"); @@ -57,7 +58,6 @@ for (var i in selectedClasses) { this[i] += " " + selectedClasses[i]; } - var proxy = jQuery.proxy(this.__inputHandler, this) this.input.change(proxy); this.input.submit(proxy); this.track.keydown(jQuery.proxy(this.__keydownHandler, this));

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19352 - in modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US: extras and 1 other directory.

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

Author: SeanRogers Date: 2010-09-28 01:57:06 -0400 (Tue, 28 Sep 2010) New Revision: 19352 Added: modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values.xml_sample Modified: modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample Log: Added rich:autocompleteBehavior Modified: modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml =================================================================== --- modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-09-27 19:36:07 UTC (rev 19351) +++ modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-09-28 05:57:06 UTC (rev 19352) @@ -122,6 +122,9 @@ <para> The <sgmltag><rich:autocomplete></sgmltag> component is an auto-completing input-box with built-in Ajax capabilities. It supports client-side suggestions, browser-like selection, and customization of the look and feel. </para> + <para> + To attach an auto-completion behavior to other components, use the <sgmltag><rich:autocompleteBehavior></sgmltag> behavior. Refer to <xref linkend="sect-Component_Reference-Rich_inputs-richautocompleteBehavior" /> for full details on the <sgmltag><rich:autocompleteBehavior></sgmltag> behavior. + </para> <figure id="figu-Component_Reference-richautocomplete-richautocomplete"> <title><sgmltag><rich:autocomplete></sgmltag></title> <mediaobject> @@ -139,7 +142,7 @@ <section id="sect-Component_Reference-richautocomplete-Basic_usage"> <title>Basic usage</title> <para> - The <varname>value</varname> attribute stores the text entered by the user for the auto-complete box. Suggestions shown in the auto-complete list can be specified using the <varname>autocompleteList</varname> attribute, which points to a collection of suggestions: + The <varname>value</varname> attribute stores the text entered by the user for the auto-complete box. Suggestions shown in the auto-complete list can be specified using the <varname>autocompleteMethod</varname> attribute, which points to a collection of suggestions. </para> <example id="exam-Component_Reference-richautocomplete-Defining_suggestion_values"> <title>Defining suggestion values</title> @@ -228,6 +231,54 @@ </section> </section> +  + <section id="sect-Component_Reference-Rich_inputs-richautocompleteBehavior"> + <title><sgmltag><rich:autocompleteBehavior></sgmltag></title> + <para> + The <sgmltag><rich:autocompleteBehavior></sgmltag> behavior is an auto-completing list of input suggestions that can be attached to other components. + </para> + <para> + Use the <sgmltag><rich:autocomplete></sgmltag> component for a standard auto-completing combo-box control. Refer to <xref linkend="sect-Component_Reference-Rich_inputs-richautocomplete" /> for full details on the <sgmltag><rich:autocomplete></sgmltag> component. + </para> + + <section id="sect-Component_Reference-richautocompleteBehavior-Basic_usage"> + <title>Basic usage</title> + <para> + Attach the <sgmltag><rich:autocompleteBehavior></sgmltag> behavior as a sub-element to another component to provide auto-complete suggestions for that component. Suggestions shown in the auto-complete list can be specified using the <varname>autocompleteMethod</varname> attribute, which points to a collection of suggestions. <xref linkend="exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values" /> demonstrates a <sgmltag><rich:autocompleteBehavior></sgmltag> behavior attached to a standard JSF <sgmltag><h:inputText></sgmltag> component. + </para> + <example id="exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values"> + <title>Defining suggestion values</title> + <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + </example> + </section> + + <section id="sect-Component_Reference-richautocompleteBehavior-Reference_data"> + <title>Reference data</title> + <itemizedlist> + <listitem> + <para> + <parameter>component-type</parameter>: <classname>org.richfaces.autocompleteBehavior</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlAutocompleteBehavior</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-family</parameter>: <classname>org.richfaces.autocompleteBehavior</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.autocompleteBehaviorTag</classname> + </para> + </listitem> + </itemizedlist> + </section> + </section> +  <!-- <section id="sect-Component_Reference-Rich_inputs-richeditor"> Modified: modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample =================================================================== --- modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample 2010-09-27 19:36:07 UTC (rev 19351) +++ modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocomplete-Defining_suggestion_values.xml_sample 2010-09-28 05:57:06 UTC (rev 19352) @@ -1 +1 @@ -<rich:autocomplete value="#{bean.state}" autocompleteList="#{bean.suggestions}" /> +<rich:autocomplete value="#{bean.state}" autocompleteMethod="#{bean.suggestions}" /> Added: modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values.xml_sample =================================================================== --- modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values.xml_sample (rev 0) +++ modules/docs/branches/M3_draft/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values.xml_sample 2010-09-28 05:57:06 UTC (rev 19352) @@ -0,0 +1,3 @@ +<h:inputText> + <rich:autocomplete value="#{bean.state}" autocompleteMethod="#{bean.suggestions}" /> +</h:inputText>

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19351 - trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit.

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

Author: konstantin.mishin Date: 2010-09-27 15:36:07 -0400 (Mon, 27 Sep 2010) New Revision: 19351 Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java Log: RF-9292 Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java =================================================================== --- trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-09-27 19:28:11 UTC (rev 19350) +++ trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-09-27 19:36:07 UTC (rev 19351) @@ -121,7 +121,7 @@ HtmlPage page = environment.getPage("/extendedDataTableTest.jsf"); HtmlElement table = page.getElementById("table"); String text = table.getElementsByTagName("style").get(0).getTextContent(); - assertTrue(text.contains(".rf-edt-cnt, .rf-edt-ftr-cnt")); + assertTrue(text.contains(".rf-edt-cnt")); assertTrue(text.contains("rf-edt-c")); HtmlElement header = table.getFirstByXPath("div[@class='rf-edt-hdr']"); HtmlElement frozenHeader = header.getElementById("table:frozenHeader");

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19350 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.

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

Author: amarkhel Date: 2010-09-27 15:28:11 -0400 (Mon, 27 Sep 2010) New Revision: 19350 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanelSizer.js Log: RF-9362 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanelSizer.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanelSizer.js 2010-09-27 19:27:49 UTC (rev 19349) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanelSizer.js 2010-09-27 19:28:11 UTC (rev 19350) @@ -114,7 +114,7 @@ doDiff : function(dx, dy) { return new richfaces.ui.PopupPanel.Sizer.Diff(0, dy, 0, -dy); - }, + } });

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19349 - in trunk/ui/core/ui/src/main/java/org/richfaces: renderkit/html and 1 other directory.

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

Author: amarkhel Date: 2010-09-27 15:27:49 -0400 (Mon, 27 Sep 2010) New Revision: 19349 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java Log: RF-9328 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java 2010-09-27 19:25:28 UTC (rev 19348) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java 2010-09-27 19:27:49 UTC (rev 19349) @@ -81,6 +81,14 @@ } public boolean hasQueuesToEncode() { - return !queuesData.isEmpty(); + if (queuesData.isEmpty()) { + return false; + } + for (Map.Entry<String, UIComponent> queue : queuesData.entrySet()) { + if (queue.getValue().isRendered()) { + return true; + } + } + return false; } } \ No newline at end of file Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-09-27 19:25:28 UTC (rev 19348) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-09-27 19:27:49 UTC (rev 19349) @@ -89,9 +89,6 @@ } UIComponent comp = event.getComponent(); - if (!comp.isRendered()) { - return; - } String queueName = getQueueName(context, comp); QueueRegistry queueRegistry = QueueRegistry.getInstance(context); Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-09-27 19:25:28 UTC (rev 19348) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-09-27 19:27:49 UTC (rev 19349) @@ -93,6 +93,9 @@ boolean isFirst = true; Map<String, UIComponent> registeredQueues = registry.getRegisteredQueues(); for (Entry<String, UIComponent> queueEntry : registeredQueues.entrySet()) { + if (!queueEntry.getValue().isRendered()) { + break; + } if (isFirst) { isFirst = false; } else {

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19348 - in trunk/ui/iteration/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.

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

Author: konstantin.mishin Date: 2010-09-27 15:25:28 -0400 (Mon, 27 Sep 2010) New Revision: 19348 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js Log: RF-9292 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-09-27 18:56:19 UTC (rev 19347) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-09-27 19:25:28 UTC (rev 19348) @@ -292,8 +292,8 @@ } } else { writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-" - + ("footer".equals(name) ? "ftr-" : "") + "cnt", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cnt" + + ("footer".equals(name) ? " rf-edt-ftr-cnt" : ""), null); } String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0); @@ -606,10 +606,6 @@ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - writer.startElement(HtmlConstants.DIV_ELEM, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-mkr", null); - writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.TABLE_ELEMENT, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":r", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord", null); @@ -629,6 +625,10 @@ } writer.endElement(HtmlConstants.TABLE_ELEMENT); writer.startElement(HtmlConstants.DIV_ELEM, component); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-mkr", null); + writer.endElement(HtmlConstants.DIV_ELEM); + writer.startElement(HtmlConstants.DIV_ELEM, component); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord-mkr", null); writer.endElement(HtmlConstants.DIV_ELEM); @@ -683,7 +683,7 @@ UIDataTableBase table = state.getRow(); writer.startElement("style", table); writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/css", null); - writer.writeText(".rf-edt-cnt, .rf-edt-ftr-cnt {", null); // TODO getNormalizedId(context, state.getGrid()) + writer.writeText("div.rf-edt-cnt {", null); // TODO getNormalizedId(context, state.getGrid()) writer.writeText("width: 100%;", "width"); writer.writeText("}", null); Iterator<UIComponent> columns = table.columns(); Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-09-27 18:56:19 UTC (rev 19347) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-09-27 19:25:28 UTC (rev 19348) @@ -135,7 +135,7 @@ var reorderMarkerElement = document.getElementById(id + ":rm"); var widthInput = document.getElementById(id + ":wi"); var selectionInput = document.getElementById(id + ":si"); - var normalPartStyle = richfaces.utils.getCSSRule(".rf-edt-cnt, .rf-edt-ftr-cnt").style; + var normalPartStyle = richfaces.utils.getCSSRule("div.rf-edt-cnt").style; var header = jQuery(element).children(".rf-edt-hdr"); var resizerHolders = header.find(".rf-edt-rsz-cntr"); @@ -183,7 +183,7 @@ } var height = element.clientHeight; var el = element.firstChild; - while (el) { + while (el && el.nodeName && el.nodeName.toUpperCase() != "TABLE") { if(el.nodeName && el.nodeName.toUpperCase() == "DIV" && el != bodyElement) { height -= el.offsetHeight; }

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19347 - in trunk/ui/iteration/ui/src: main/resources/META-INF/resources/org.richfaces and 2 other directories.

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

Author: konstantin.mishin Date: 2010-09-27 14:56:19 -0400 (Mon, 27 Sep 2010) New Revision: 19347 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java Log: RF-9294 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-09-27 16:36:34 UTC (rev 19346) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-09-27 18:56:19 UTC (rev 19347) @@ -217,10 +217,10 @@ if (isCurrentPage) { out.startElement(HtmlConstants.SPAN_ELEM, component); - out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-dtl rf-ds-cur " + styleClass, null); + out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-nmb-btn rf-ds-act " + styleClass, null); } else { out.startElement(HtmlConstants.A_ELEMENT, component); - out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-dtl " + styleClass, null); + out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-nmb-btn " + styleClass, null); out.writeAttribute(HtmlConstants.HREF_ATTR, "javascript:void(0);", null); } Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2010-09-27 16:36:34 UTC (rev 19346) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2010-09-27 18:56:19 UTC (rev 19347) @@ -7,7 +7,7 @@ background:'#{richSkin.tableBackgroundColor}'; } -a.rf-ds-dtl { +a.rf-ds-nmb-btn { color: '#{richSkin.generalTextColor}'; } @@ -50,15 +50,15 @@ font-weight: normal; } -.rf-ds-l { +.rf-ds-lft { margin-right: 1px; } -.rf-ds-r { +.rf-ds-rgh { margin-left: 1px; } -.rf-ds-dtl { +.rf-ds-nmb-btn { cursor: pointer; width: 2em; text-align: center; @@ -88,7 +88,7 @@ } -.rf-ds-over { +.rf-ds-hov { border-width : 1px; border-style: solid; border-color: '#{richSkin.tableBorderColor}'; @@ -105,7 +105,7 @@ background: '#{richSkin.additionalBackgroundColor}'; } -.rf-ds-cur { +.rf-ds-act { cursor: default; font-weight: bold; border-width: 1px; Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2010-09-27 16:36:34 UTC (rev 19346) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2010-09-27 18:56:19 UTC (rev 19347) @@ -69,25 +69,25 @@ if(buttons) { var leftButtons = buttons.left; - css.mouseover = "rf-ds-btn rf-ds-l"; - css.mouseup = "rf-ds-btn rf-ds-l"; - css.mouseout = "rf-ds-btn rf-ds-l"; - css.mousedown = "rf-ds-btn rf-ds-l rf-ds-over"; + css.mouseover = "rf-ds-btn rf-ds-lft"; + css.mouseup = "rf-ds-btn rf-ds-lft"; + css.mouseout = "rf-ds-btn rf-ds-lft"; + css.mousedown = "rf-ds-btn rf-ds-lft rf-ds-hov"; initButtons(leftButtons,css, this); var rightButtons = buttons.right; - css.mouseover = "rf-ds-btn rf-ds-r"; - css.mouseup = "rf-ds-btn rf-ds-r"; - css.mouseout = "rf-ds-btn rf-ds-r"; - css.mousedown = "rf-ds-btn rf-ds-r rf-ds-over"; + css.mouseover = "rf-ds-btn rf-ds-rgh"; + css.mouseup = "rf-ds-btn rf-ds-rgh"; + css.mouseout = "rf-ds-btn rf-ds-rgh"; + css.mousedown = "rf-ds-btn rf-ds-rgh rf-ds-hov"; initButtons(rightButtons,css, this); } if(digitals) { - css.mouseover= "rf-ds-dtl rf-ds-over"; - css.mouseup= "rf-ds-dtl rf-ds-over"; - css.mouseout = "rf-ds-dtl"; - css.mousedown="rf-ds-dtl rf-ds-press"; + css.mouseover= "rf-ds-nmb-btn rf-ds-hov"; + css.mouseup= "rf-ds-nmb-btn rf-ds-hov"; + css.mouseout = "rf-ds-nmb-btn"; + css.mousedown="rf-ds-nmb-btn rf-ds-press"; initButtons(digitals, css,this); } }; Modified: trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml =================================================================== --- trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml 2010-09-27 16:36:34 UTC (rev 19346) +++ trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml 2010-09-27 18:56:19 UTC (rev 19347) @@ -44,8 +44,8 @@ <c:if test="#{controlsState.firstRendered}"> <cdk:object type="boolean" name="isEnabled" value="#{controlsState.firstEnabled}"/> <cdk:object type="UIComponent" name="facet" value="#{component.getFacet('first')}"/> - <cdk:object type="String" name="enabledStyles" value="rf-ds-btn rf-ds-l"/> - <cdk:object type="String" name="disabledStyles" value="rf-ds-btn rf-ds-l rf-ds-dis"/> + <cdk:object type="String" name="enabledStyles" value="rf-ds-btn rf-ds-lft"/> + <cdk:object type="String" name="disabledStyles" value="rf-ds-btn rf-ds-lft rf-ds-dis"/> <cdk:object type="String" name="id" value="#{clientId}_ds_f"/> <cdk:object type="String" name="defaultText" value="««««"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -54,8 +54,8 @@ <c:if test="#{controlsState.fastRewindRendered}"> <cdk:object type="boolean" name="isEnabled" value="#{controlsState.fastRewindEnabled}"/> <cdk:object type="UIComponent" name="facet" value="#{component.getFacet('fastRewind')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-l"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-l rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-lft"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-lft rf-ds-dis"/> <cdk:object type="java.lang.String" name="id" value="#{clientId}_ds_fr"/> <cdk:object type="java.lang.String" name="defaultText" value="««"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -64,8 +64,8 @@ <c:if test="#{controlsState.previousRendered}"> <cdk:object name="isEnabled" value="#{controlsState.previousEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('previous')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-l"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-l rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-lft"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-lft rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_prev"/> <cdk:object name="defaultText" value="«"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -76,8 +76,8 @@ <c:if test="#{controlsState.nextRendered}"> <cdk:object name="isEnabled" value="#{controlsState.nextEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('next')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-r"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-r rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-rgh"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-rgh rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_next"/> <cdk:object name="defaultText" value="»"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -86,8 +86,8 @@ <c:if test="#{controlsState.fastForwardRendered}"> <cdk:object name="isEnabled" value="#{controlsState.fastForwardEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('fastForward')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-r"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-r rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-rgh"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-rgh rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_ff"/> <cdk:object name="defaultText" value="»»"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> @@ -96,8 +96,8 @@ <c:if test="#{controlsState.lastRendered}"> <cdk:object name="isEnabled" value="#{controlsState.lastEnabled}"/> <cdk:object name="facet" value="#{component.getFacet('last')}"/> - <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-r"/> - <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-r rf-ds-dis"/> + <cdk:object type="java.lang.String" name="enabledStyles" value="rf-ds-btn rf-ds-rgh"/> + <cdk:object type="java.lang.String" name="disabledStyles" value="rf-ds-btn rf-ds-rgh rf-ds-dis"/> <cdk:object name="id" value="#{clientId}_ds_l"/> <cdk:object name="defaultText" value="»»»»"/> <xi:include xpointer="xpointer(/*)" href="buttons.template.include" /> Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java =================================================================== --- trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java 2010-09-27 16:36:34 UTC (rev 19346) +++ trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java 2010-09-27 18:56:19 UTC (rev 19347) @@ -49,56 +49,56 @@ // first/fastRewind/previous buttons with arrows HtmlElement first = getFirstButton(page, scrollerId); assertEquals("span", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); HtmlElement fastRewind = getFastRewindButton(page, scrollerId); assertEquals("span", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); HtmlElement previous = getPreviousButton(page, scrollerId); assertEquals("span", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // currently selected digital button HtmlElement dc1 = getDigitalButton(page, scrollerId, 1); assertEquals("span", dc1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", dc1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", dc1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // digital buttons HtmlElement d2 = getDigitalButton(page, scrollerId, 2); assertEquals("a", d2.getNodeName()); - assertEquals("rf-ds-dtl", d2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d2.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement d3 = getDigitalButton(page, scrollerId, 3); assertEquals("a", d3.getNodeName()); - assertEquals("rf-ds-dtl", d3.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d3.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d3.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement d4 = getDigitalButton(page, scrollerId, 4); assertEquals("a", d4.getNodeName()); - assertEquals("rf-ds-dtl", d4.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d4.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d4.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement d5 = getDigitalButton(page, scrollerId, 5); assertEquals("a", d5.getNodeName()); - assertEquals("rf-ds-dtl", d5.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn", d5.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", d5.getAttribute(HtmlConstants.HREF_ATTR)); // next/fastForward/last buttons with arrows HtmlElement next = getNextButton(page, scrollerId); assertEquals("a", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", next.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement fastForward = getFastForwardButton(page, scrollerId); assertEquals("a", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", fastForward.getAttribute(HtmlConstants.HREF_ATTR)); HtmlElement last = getLastButton(page, scrollerId); assertEquals("a", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("javascript:void(0);", last.getAttribute(HtmlConstants.HREF_ATTR)); } @@ -151,12 +151,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -171,12 +171,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -198,12 +198,12 @@ next.click(); HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller outside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -218,12 +218,12 @@ HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -247,12 +247,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -267,12 +267,12 @@ HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -294,12 +294,12 @@ ff.click(); HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller outside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -314,12 +314,12 @@ HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -342,12 +342,12 @@ currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -362,12 +362,12 @@ currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -390,12 +390,12 @@ currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller outside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -410,12 +410,12 @@ currentDigital2 = getDigitalButton(page, secondScrollerId, i); assertEquals("span", currentDigital2.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // if scroller inside dataTable has switched HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i); assertEquals("span", currentDigital1.getNodeName()); - assertEquals("rf-ds-dtl rf-ds-cur", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-nmb-btn rf-ds-act", currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); // check if page has switched assertEquals(i + " page content", getCurrentPageContent(page, i)); @@ -437,26 +437,26 @@ //check right buttons assertEquals("a", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastForward = getFastForwardButton(page, secondScrollerId); last = getFastForwardButton(page, secondScrollerId); next = getNextButton(page, secondScrollerId); assertEquals("a", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); //check if left buttons is disabled HtmlElement fastRewind = getFastRewindButton(page, firstScrollerId); @@ -464,26 +464,26 @@ HtmlElement previous = getPreviousButton(page, firstScrollerId); assertEquals("span", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastRewind = getFastRewindButton(page, secondScrollerId); first = getFirstButton(page, secondScrollerId); next = getNextButton(page, secondScrollerId); assertEquals("span", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); } private void checkLastPageButtons(HtmlPage page, String firstScrollerId, String secondScrollerId) throws Exception { @@ -493,13 +493,13 @@ HtmlElement next = getNextButton(page, firstScrollerId); assertEquals("span", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastForward = getFastForwardButton(page, secondScrollerId); @@ -507,13 +507,13 @@ next = getNextButton(page, secondScrollerId); assertEquals("span", fastForward.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", last.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("span", next.getNodeName()); - assertEquals("rf-ds-btn rf-ds-r rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis", next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); //check if left buttons is enabled HtmlElement fastRewind = getFastRewindButton(page, firstScrollerId); @@ -521,26 +521,26 @@ HtmlElement previous = getPreviousButton(page, firstScrollerId); assertEquals("a", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); fastRewind = getFastRewindButton(page, secondScrollerId); first = getFirstButton(page, secondScrollerId); previous = getPreviousButton(page, secondScrollerId); assertEquals("a", fastRewind.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", first.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); assertEquals("a", previous.getNodeName()); - assertEquals("rf-ds-btn rf-ds-l", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); + assertEquals("rf-ds-btn rf-ds-lft", previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim()); } private String getCurrentPageContent(HtmlPage page, int i) throws Exception {

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r19346 - in trunk/examples/input-demo/src/main/webapp: WEB-INF and 6 other directories.

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

Author: pyaschenko Date: 2010-09-27 12:36:34 -0400 (Mon, 27 Sep 2010) New Revision: 19346 Added: trunk/examples/input-demo/src/main/webapp/examples/ trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml trunk/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml trunk/examples/input-demo/src/main/webapp/examples/inputNumberSpinner.xhtml trunk/examples/input-demo/src/main/webapp/qunit/ trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml trunk/examples/input-demo/src/main/webapp/resources/ trunk/examples/input-demo/src/main/webapp/resources/qunit/ trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.css trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.js trunk/examples/input-demo/src/main/webapp/resources/qunit/richfaces-qunit.js trunk/examples/input-demo/src/main/webapp/resources/tests/ trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js trunk/examples/input-demo/src/main/webapp/templates/ trunk/examples/input-demo/src/main/webapp/templates/template.xhtml Removed: trunk/examples/input-demo/src/main/webapp/autocomplete.xhtml trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml trunk/examples/input-demo/src/main/webapp/inputNumberSlider.xhtml trunk/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml Modified: trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml trunk/examples/input-demo/src/main/webapp/index.xhtml Log: https://jira.jboss.org/browse/RF-9071 Modified: trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-09-27 14:13:39 UTC (rev 19345) +++ trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-09-27 16:36:34 UTC (rev 19346) @@ -3,5 +3,32 @@ <faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" - version="2.0"> + version="2.0"> + + <navigation-rule> +  + <navigation-case> + <from-outcome>inplaceInput</from-outcome> + <to-view-id>/examples/inplaceInput.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>inputNumberSlider</from-outcome> + <to-view-id>/examples/inputNumberSlider.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>inputNumberSpinner</from-outcome> + <to-view-id>/examples/inputNumberSpinner.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>autocomplete</from-outcome> + <to-view-id>/examples/autocomplete.xhtml</to-view-id> + </navigation-case> + +  + <navigation-case> + <from-outcome>qunit/autocomplete</from-outcome> + <to-view-id>/qunit/autocomplete-qunit.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + </faces-config> Deleted: trunk/examples/input-demo/src/main/webapp/autocomplete.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/autocomplete.xhtml 2010-09-27 14:13:39 UTC (rev 19345) +++ trunk/examples/input-demo/src/main/webapp/autocomplete.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -1,75 +0,0 @@ -<!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:input="http://richfaces.org/input" - xmlns:a4j="http://richfaces.org/a4j"> -<f:view contentType="text/html" /> - -<h:head> - <title>Richfaces ComboBox</title> -</h:head> - -<h:body style="margin: 30px;"> - - <h:form id="form"> - <h:selectOneMenu value="#{autoCompleteBean.mode}" onchange="submit()"> - <f:selectItem itemValue="lazyClient"/> - <f:selectItem itemValue="client"/> - <f:selectItem itemValue="cachedAjax"/> - <f:selectItem itemValue="ajax"/> - </h:selectOneMenu><br/> - <div style="height: 300px; width: 300px; overflow: auto; float:left;">Text - block text block text block text block text block text block text - block text block - - <input:autocomplete id="myAutocomplete" clientFilter="if(subString.length>1) if(value.indexOf(subString)!=-1) return true;" mode="#{autoCompleteBean.mode}" minChars="2" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" fetchValue="#{country.name}" showButton="true" - onchange="return onEvent.call(this, event);" onselectitem="return onEvent.call(this, event);" onblur="return onEvent.call(this, event);" onfocus="return onEvent.call(this, event);"> - #{country.name} #{country.iso} #{country.domain} - </input:autocomplete> - <script type="text/javascript"> - onEvent = function(event, element, data){ - RichFaces.log.info("jQuery Event: "+(event instanceof jQuery.Event)+"; event: "+event.type+"; data:"+(data || (event['rich']||{})['data'])+"; this.id:"+this.id+"; component:"+ (event['rich']||{})['component']||RichFaces.$(this.id)); - }; - RichFaces.Event.bindById("form:myAutocomplete", "selectitem change blur focus", onEvent); - </script> - <br /> - <select style="width: 200px" name="select"> - <option>ccccc</option> - </select>  text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block text block text block text block text - block text block text block - </div> - <div> - <a4j:log mode="inline"></a4j:log> - </div> - </h:form> -</h:body> -</html> Copied: trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml (from rev 19342, trunk/examples/input-demo/src/main/webapp/autocomplete.xhtml) =================================================================== --- trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,86 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:input="http://richfaces.org/input" + xmlns:a4j="http://richfaces.org/a4j"> +<f:view contentType="text/html" /> + +<h:head> + <title>Richfaces Autocomplete</title> +</h:head> + +<h:body style="margin: 30px;"> + +<ui:composition template="/templates/template.xhtml"> + + <ui:define name="title">Autocomplete Example</ui:define> + <ui:define name="body_head">Autocomplete Example</ui:define> + + <ui:define name="body"> + + <h:form id="form"> + <h:selectOneMenu value="#{autoCompleteBean.mode}" onchange="submit()"> + <f:selectItem itemValue="lazyClient"/> + <f:selectItem itemValue="client"/> + <f:selectItem itemValue="cachedAjax"/> + <f:selectItem itemValue="ajax"/> + </h:selectOneMenu><br/> + <div style="height: 300px; width: 300px; overflow: auto; float:left;">Text + block text block text block text block text block text block text + block text block + + <input:autocomplete autofill="false" id="myAutocomplete" clientFilter="if(subString.length>1) if(value.indexOf(subString)!=-1) return true;" mode="#{autoCompleteBean.mode}" minChars="2" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" fetchValue="#{country.name}" showButton="true" + onchange="return onEvent.call(this, event);" onselectitem="return onEvent.call(this, event);" onblur="return onEvent.call(this, event);" onfocus="return onEvent.call(this, event);"> + #{country.name} #{country.iso} #{country.domain} + </input:autocomplete> + <script type="text/javascript"> + onEvent = function(event, element, data){ + RichFaces.log.info("jQuery Event: "+(event instanceof jQuery.Event)+"; event: "+event.type+"; data:"+(data || (event['rich']||{})['data'])+"; this.id:"+this.id+"; component:"+ (event['rich']||{})['component']||RichFaces.$(this.id)); + }; + RichFaces.Event.bindById("form:myAutocomplete", "selectitem change blur focus", onEvent); + </script> + <br /> + <select style="width: 200px" name="select"> + <option>ccccc</option> + </select>  text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block text block text block text block text + block text block text block + </div> + <div> + <a4j:log mode="inline"></a4j:log> + </div> + </h:form> + + </ui:define> +</ui:composition> + +</h:body> +</html> Copied: trunk/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml (from rev 19342, trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml) =================================================================== --- trunk/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,19 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:in="http://richfaces.org/input"> +<f:view contentType="text/html" /> + +<h:head> + <title>InplaceInput</title> +</h:head> + +<h:body> + <h:form id="form"> + <in:inplaceInput showControls="false" value="New York"/> + <h:commandButton value="submit"/> + </h:form> +</h:body> +</html> Copied: trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml (from rev 19342, trunk/examples/input-demo/src/main/webapp/inputNumberSlider.xhtml) =================================================================== --- trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,116 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:ins="http://richfaces.org/input"> + + <h:head> + <title>Richfaces InputNumberSlider Demo</title> + </h:head> + <h:body> + <h:form id="form"> + <h:outputText value="Skin: "/> + <h:selectOneMenu value="#{skinBean.skin}" onchange="submit();"> + <f:selectItems value="#{skinBean.skins}"/> + </h:selectOneMenu> + <br /> + <ins:inputNumberSlider id="ins" value="#{inputNumberSliderBean.value}" accesskey="#{inputNumberSliderBean.accesskey}" delay="#{inputNumberSliderBean.delay}" + disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}" + inputPosition="#{inputNumberSliderBean.inputPosition}" inputSize="#{inputNumberSliderBean.inputSize}" showArrows="#{inputNumberSliderBean.showArrows}" + showBoundaryValues="#{inputNumberSliderBean.showBoundaryValues}" showInput="#{inputNumberSliderBean.showInput}" + showToolTip="#{inputNumberSliderBean.showToolTip}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}" + step="#{inputNumberSliderBean.step}" /> + <br /> + <h:outputText value="Accesskey: "/> + <h:inputText value="#{inputNumberSliderBean.accesskey}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="EnableManualInput: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.enableManualInput}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="Disabled "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.disabled}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="Delay: "/> + <h:inputText value="#{inputNumberSliderBean.delay}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="InputPosition: "/> + <h:selectOneMenu value="#{inputNumberSliderBean.inputPosition}"> + <f:selectItems value="#{inputNumberSliderBean.positionTypes}"/> + <f:ajax render="ins"/> + </h:selectOneMenu> + <br /> + <h:outputText value="InputSize: "/> + <h:inputText value="#{inputNumberSliderBean.inputSize}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="MaxValue: "/> + <h:inputText value="#{inputNumberSliderBean.maxValue}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="MinValue: "/> + <h:inputText value="#{inputNumberSliderBean.minValue}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="ShowArrows: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showArrows}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="ShowBoundaryValues: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showBoundaryValues}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="ShowInput: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showInput}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="ShowToolTip: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showToolTip}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="Step: "/> + <h:inputText value="#{inputNumberSliderBean.step}"> + <f:ajax render="ins"/> + </h:inputText> + </h:form> + </h:body> +</html> Copied: trunk/examples/input-demo/src/main/webapp/examples/inputNumberSpinner.xhtml (from rev 19342, trunk/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml) =================================================================== --- trunk/examples/input-demo/src/main/webapp/examples/inputNumberSpinner.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/examples/inputNumberSpinner.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,98 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:ins="http://richfaces.org/input"> + + <h:head> + <title>Richfaces InputNumberSlider Demo</title> + </h:head> + <h:body> + <h:form id="form"> + <h:outputText value="Skin: "/> + <h:selectOneMenu value="#{skinBean.skin}" onchange="submit();"> + <f:selectItems value="#{skinBean.skins}"/> + </h:selectOneMenu> + <br /> + <h:outputText value="Date: "/> + <h:outputText id="date" value="#{inputNumberSliderBean.date}" /> + <br /> + <ins:inputNumberSpinner id="ins" value="#{inputNumberSliderBean.value}" accesskey="#{inputNumberSliderBean.accesskey}" cycled="#{inputNumberSliderBean.showInput}" + disableBrowserAutoComplete="#{inputNumberSliderBean.showArrows}" disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}" + inputSize="#{inputNumberSliderBean.inputSize}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}" + step="#{inputNumberSliderBean.step}"> + <f:ajax render="date" /> + </ins:inputNumberSpinner> + <br /> + <h:outputText value="Accesskey: " /> + <h:inputText value="#{inputNumberSliderBean.accesskey}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="Cycled: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showInput}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="DisableBrowserAutoComplete: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showArrows}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="Disabled: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.disabled}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="EnableManualInput: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.enableManualInput}"> + <f:ajax render="ins"/> + </h:selectBooleanCheckbox> + <br /> + <h:outputText value="InputSize: "/> + <h:inputText value="#{inputNumberSliderBean.inputSize}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="MaxValue: "/> + <h:inputText value="#{inputNumberSliderBean.maxValue}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="MinValue: "/> + <h:inputText value="#{inputNumberSliderBean.minValue}"> + <f:ajax render="ins"/> + </h:inputText> + <br /> + <h:outputText value="Step: "/> + <h:inputText value="#{inputNumberSliderBean.step}"> + <f:ajax render="ins"/> + </h:inputText> + </h:form> + </h:body> +</html> Modified: trunk/examples/input-demo/src/main/webapp/index.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/index.xhtml 2010-09-27 14:13:39 UTC (rev 19345) +++ trunk/examples/input-demo/src/main/webapp/index.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -6,26 +6,14 @@ <h:head> </h:head> <h:body> - <h4>Input Components Sample</h4> - <ul> - <li><h:link outcome="inplaceInput">rich:inplaceInput</h:link></li> - <li><h:link outcome="inputNumberSlider">rich:inputNumberSlider</h:link></li> - <li><h:link outcome="inputNumberSpinner">rich:inputNumberSpinner</h:link></li> - <li><h:link outcome="autocomplete">rich:autocomplete</h:link></li> - </ul> +<ui:composition template="/templates/template.xhtml"> - <h:form> - <h:panelGrid columns="3"> - <h:commandButton value="Classic"> - <f:setPropertyActionListener target="#{skinBean.skin}" value="classic" /> - </h:commandButton> - <h:commandButton value="BlueSky"> - <f:setPropertyActionListener target="#{skinBean.skin}" value="blueSky" /> - </h:commandButton> - <h:commandButton value="DeepMarine"> - <f:setPropertyActionListener target="#{skinBean.skin}" value="deepMarine" /> - </h:commandButton> - </h:panelGrid> - </h:form> + <ui:define name="title">RichFaces Sample</ui:define> + + <ui:define name="body"> + </ui:define> + + <div style="top: auto;"></div> +</ui:composition> </h:body> </html> \ No newline at end of file Deleted: trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml 2010-09-27 14:13:39 UTC (rev 19345) +++ trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -1,19 +0,0 @@ -<!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:in="http://richfaces.org/input"> -<f:view contentType="text/html" /> - -<h:head> - <title>InplaceInput</title> -</h:head> - -<h:body> - <h:form id="form"> - <in:inplaceInput showControls="false" value="New York"/> - <h:commandButton value="submit"/> - </h:form> -</h:body> -</html> Deleted: trunk/examples/input-demo/src/main/webapp/inputNumberSlider.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/inputNumberSlider.xhtml 2010-09-27 14:13:39 UTC (rev 19345) +++ trunk/examples/input-demo/src/main/webapp/inputNumberSlider.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -1,116 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:ins="http://richfaces.org/input"> - - <h:head> - <title>Richfaces InputNumberSlider Demo</title> - </h:head> - <h:body> - <h:form id="form"> - <h:outputText value="Skin: "/> - <h:selectOneMenu value="#{skinBean.skin}" onchange="submit();"> - <f:selectItems value="#{skinBean.skins}"/> - </h:selectOneMenu> - <br /> - <ins:inputNumberSlider id="ins" value="#{inputNumberSliderBean.value}" accesskey="#{inputNumberSliderBean.accesskey}" delay="#{inputNumberSliderBean.delay}" - disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}" - inputPosition="#{inputNumberSliderBean.inputPosition}" inputSize="#{inputNumberSliderBean.inputSize}" showArrows="#{inputNumberSliderBean.showArrows}" - showBoundaryValues="#{inputNumberSliderBean.showBoundaryValues}" showInput="#{inputNumberSliderBean.showInput}" - showToolTip="#{inputNumberSliderBean.showToolTip}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}" - step="#{inputNumberSliderBean.step}" /> - <br /> - <h:outputText value="Accesskey: "/> - <h:inputText value="#{inputNumberSliderBean.accesskey}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="EnableManualInput: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.enableManualInput}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="Disabled "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.disabled}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="Delay: "/> - <h:inputText value="#{inputNumberSliderBean.delay}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="InputPosition: "/> - <h:selectOneMenu value="#{inputNumberSliderBean.inputPosition}"> - <f:selectItems value="#{inputNumberSliderBean.positionTypes}"/> - <f:ajax render="ins"/> - </h:selectOneMenu> - <br /> - <h:outputText value="InputSize: "/> - <h:inputText value="#{inputNumberSliderBean.inputSize}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="MaxValue: "/> - <h:inputText value="#{inputNumberSliderBean.maxValue}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="MinValue: "/> - <h:inputText value="#{inputNumberSliderBean.minValue}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="ShowArrows: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showArrows}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="ShowBoundaryValues: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showBoundaryValues}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="ShowInput: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showInput}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="ShowToolTip: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showToolTip}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="Step: "/> - <h:inputText value="#{inputNumberSliderBean.step}"> - <f:ajax render="ins"/> - </h:inputText> - </h:form> - </h:body> -</html> Deleted: trunk/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml 2010-09-27 14:13:39 UTC (rev 19345) +++ trunk/examples/input-demo/src/main/webapp/inputNumberSpinner.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -1,98 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:ins="http://richfaces.org/input"> - - <h:head> - <title>Richfaces InputNumberSlider Demo</title> - </h:head> - <h:body> - <h:form id="form"> - <h:outputText value="Skin: "/> - <h:selectOneMenu value="#{skinBean.skin}" onchange="submit();"> - <f:selectItems value="#{skinBean.skins}"/> - </h:selectOneMenu> - <br /> - <h:outputText value="Date: "/> - <h:outputText id="date" value="#{inputNumberSliderBean.date}" /> - <br /> - <ins:inputNumberSpinner id="ins" value="#{inputNumberSliderBean.value}" accesskey="#{inputNumberSliderBean.accesskey}" cycled="#{inputNumberSliderBean.showInput}" - disableBrowserAutoComplete="#{inputNumberSliderBean.showArrows}" disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}" - inputSize="#{inputNumberSliderBean.inputSize}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}" - step="#{inputNumberSliderBean.step}"> - <f:ajax render="date" /> - </ins:inputNumberSpinner> - <br /> - <h:outputText value="Accesskey: " /> - <h:inputText value="#{inputNumberSliderBean.accesskey}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="Cycled: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showInput}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="DisableBrowserAutoComplete: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showArrows}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="Disabled: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.disabled}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="EnableManualInput: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.enableManualInput}"> - <f:ajax render="ins"/> - </h:selectBooleanCheckbox> - <br /> - <h:outputText value="InputSize: "/> - <h:inputText value="#{inputNumberSliderBean.inputSize}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="MaxValue: "/> - <h:inputText value="#{inputNumberSliderBean.maxValue}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="MinValue: "/> - <h:inputText value="#{inputNumberSliderBean.minValue}"> - <f:ajax render="ins"/> - </h:inputText> - <br /> - <h:outputText value="Step: "/> - <h:inputText value="#{inputNumberSliderBean.step}"> - <f:ajax render="ins"/> - </h:inputText> - </h:form> - </h:body> -</html> Added: trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,47 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:input="http://richfaces.org/input" + xmlns:a4j="http://richfaces.org/a4j"> + +<f:view contentType="text/html" /> + +<h:head> + <title>Richfaces Autocomplete</title> +</h:head> + +<h:body style="margin: 30px;"> + +<ui:composition template="/templates/template.xhtml"> + + <ui:define name="scripts"> + <h:outputScript name="qunit/qunit.js" /> + <h:outputScript name="qunit/richfaces-qunit.js" /> + + <h:outputStylesheet name="qunit/qunit.css" /> + </ui:define> + + <ui:define name="title">Autocomplete qunit tests</ui:define> + <ui:define name="body_head">Autocomplete qunit tests</ui:define> + + <ui:define name="body"> + <p>Page</p> + + <h:form id="form"> + <input:autocomplete id="myAutocomplete" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" showButton="true"> + #{country.name} #{country.iso} #{country.domain} + </input:autocomplete> + </h:form> + + <p>Result</p> + <div> + <ol id="qunit-tests"></ol> + </div> + <h:outputScript name="tests/autocomplete-qunit.js" /> + </ui:define> +</ui:composition> +</h:body> +</html> + Added: trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.css =================================================================== --- trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.css (rev 0) +++ trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.css 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,119 @@ + +ol#qunit-tests { + font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial; + margin:0; + padding:0; + list-style-position:inside; + + font-size: smaller; +} +ol#qunit-tests li{ + padding:0.4em 0.5em 0.4em 2.5em; + border-bottom:1px solid #fff; + font-size:small; + list-style-position:inside; +} +ol#qunit-tests li ol{ + box-shadow: inset 0px 2px 13px #999; + -moz-box-shadow: inset 0px 2px 13px #999; + -webkit-box-shadow: inset 0px 2px 13px #999; + margin-top:0.5em; + margin-left:0; + padding:0.5em; + background-color:#fff; + border-radius:15px; + -moz-border-radius: 15px; + -webkit-border-radius: 15px; +} +ol#qunit-tests li li{ + border-bottom:none; + margin:0.5em; + background-color:#fff; + list-style-position: inside; + padding:0.4em 0.5em 0.4em 0.5em; +} + +ol#qunit-tests li li.pass{ + border-left:26px solid #C6E746; + background-color:#fff; + color:#5E740B; + } +ol#qunit-tests li li.fail{ + border-left:26px solid #EE5757; + background-color:#fff; + color:#710909; +} +ol#qunit-tests li.pass{ + background-color:#D2E0E6; + color:#528CE0; +} +ol#qunit-tests li.fail{ + background-color:#EE5757; + color:#000; +} +ol#qunit-tests li strong { + cursor:pointer; +} +h1#qunit-header{ + background-color:#0d3349; + margin:0; + padding:0.5em 0 0.5em 1em; + color:#fff; + font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial; + border-top-right-radius:15px; + border-top-left-radius:15px; + -moz-border-radius-topright:15px; + -moz-border-radius-topleft:15px; + -webkit-border-top-right-radius:15px; + -webkit-border-top-left-radius:15px; + text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px; +} +h2#qunit-banner{ + font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial; + height:5px; + margin:0; + padding:0; +} +h2#qunit-banner.qunit-pass{ + background-color:#C6E746; +} +h2#qunit-banner.qunit-fail, #qunit-testrunner-toolbar { + background-color:#EE5757; +} +#qunit-testrunner-toolbar { + font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial; + padding:0; + /*width:80%;*/ + padding:0em 0 0.5em 2em; + font-size: small; +} +h2#qunit-userAgent { + font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial; + background-color:#2b81af; + margin:0; + padding:0; + color:#fff; + font-size: small; + padding:0.5em 0 0.5em 2.5em; + text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px; +} +p#qunit-testresult{ + font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial; + margin:0; + font-size: small; + color:#2b81af; + border-bottom-right-radius:15px; + border-bottom-left-radius:15px; + -moz-border-radius-bottomright:15px; + -moz-border-radius-bottomleft:15px; + -webkit-border-bottom-right-radius:15px; + -webkit-border-bottom-left-radius:15px; + background-color:#D2E0E6; + padding:0.5em 0.5em 0.5em 2.5em; +} +strong b.fail{ + color:#710909; + } +strong b.pass{ + color:#5E740B; + } Added: trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.js =================================================================== --- trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.js (rev 0) +++ trunk/examples/input-demo/src/main/webapp/resources/qunit/qunit.js 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,1043 @@ +/* + * QUnit - A JavaScript Unit Testing Framework + * + * http://docs.jquery.com/QUnit + * + * Copyright (c) 2009 John Resig, Jörn Zaefferer + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + */ + +(function(window) { + +var QUnit = { + + // Initialize the configuration options + init: function() { + config = { + stats: { all: 0, bad: 0 }, + moduleStats: { all: 0, bad: 0 }, + started: +new Date, + blocking: false, + autorun: false, + assertions: [], + filters: [], + queue: [] + }; + + var tests = id("qunit-tests"), + banner = id("qunit-banner"), + result = id("qunit-testresult"); + + if ( tests ) { + tests.innerHTML = ""; + } + + if ( banner ) { + banner.className = ""; + } + + if ( result ) { + result.parentNode.removeChild( result ); + } + }, + + // call on start of module test to prepend name to all tests + module: function(name, testEnvironment) { + config.currentModule = name; + + synchronize(function() { + if ( config.currentModule ) { + QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all ); + } + + config.currentModule = name; + config.moduleTestEnvironment = testEnvironment; + config.moduleStats = { all: 0, bad: 0 }; + + QUnit.moduleStart( name, testEnvironment ); + }); + }, + + asyncTest: function(testName, expected, callback) { + if ( arguments.length === 2 ) { + callback = expected; + expected = 0; + } + + QUnit.test(testName, expected, callback, true); + }, + + test: function(testName, expected, callback, async) { + var name = testName, testEnvironment, testEnvironmentArg; + + if ( arguments.length === 2 ) { + callback = expected; + expected = null; + } + // is 2nd argument a testEnvironment? + if ( expected && typeof expected === 'object') { + testEnvironmentArg = expected; + expected = null; + } + + if ( config.currentModule ) { + name = config.currentModule + " module: " + name; + } + + if ( !validTest(name) ) { + return; + } + + synchronize(function() { + QUnit.testStart( testName ); + + testEnvironment = extend({ + setup: function() {}, + teardown: function() {} + }, config.moduleTestEnvironment); + if (testEnvironmentArg) { + extend(testEnvironment,testEnvironmentArg); + } + + // allow utility functions to access the current test environment + QUnit.current_testEnvironment = testEnvironment; + + config.assertions = []; + config.expected = expected; + + try { + if ( !config.pollution ) { + saveGlobal(); + } + + testEnvironment.setup.call(testEnvironment); + } catch(e) { + QUnit.ok( false, "Setup failed on " + name + ": " + e.message ); + } + + if ( async ) { + QUnit.stop(); + } + + try { + callback.call(testEnvironment); + } catch(e) { + fail("Test " + name + " died, exception and test follows", e, callback); + QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message ); + // else next test will carry the responsibility + saveGlobal(); + + // Restart the tests if they're blocking + if ( config.blocking ) { + start(); + } + } + }); + + synchronize(function() { + try { + checkPollution(); + testEnvironment.teardown.call(testEnvironment); + } catch(e) { + QUnit.ok( false, "Teardown failed on " + name + ": " + e.message ); + } + + try { + QUnit.reset(); + } catch(e) { + fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset); + } + + if ( config.expected && config.expected != config.assertions.length ) { + QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" ); + } + + var good = 0, bad = 0, + tests = id("qunit-tests"); + + config.stats.all += config.assertions.length; + config.moduleStats.all += config.assertions.length; + + if ( tests ) { + var ol = document.createElement("ol"); + ol.style.display = "none"; + + for ( var i = 0; i < config.assertions.length; i++ ) { + var assertion = config.assertions[i]; + + var li = document.createElement("li"); + li.className = assertion.result ? "pass" : "fail"; + li.appendChild(document.createTextNode(assertion.message || "(no message)")); + ol.appendChild( li ); + + if ( assertion.result ) { + good++; + } else { + bad++; + config.stats.bad++; + config.moduleStats.bad++; + } + } + + var b = document.createElement("strong"); + b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + config.assertions.length + ")</b>"; + + addEvent(b, "click", function() { + var next = b.nextSibling, display = next.style.display; + next.style.display = display === "none" ? "block" : "none"; + }); + + addEvent(b, "dblclick", function(e) { + var target = e && e.target ? e.target : window.event.srcElement; + if ( target.nodeName.toLowerCase() === "strong" ) { + var text = "", node = target.firstChild; + + while ( node.nodeType === 3 ) { + text += node.nodeValue; + node = node.nextSibling; + } + + text = text.replace(/(^\s*|\s*$)/g, ""); + + if ( window.location ) { + window.location.href = window.location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(text); + } + } + }); + + var li = document.createElement("li"); + li.className = bad ? "fail" : "pass"; + li.appendChild( b ); + li.appendChild( ol ); + tests.appendChild( li ); + + if ( bad ) { + var toolbar = id("qunit-testrunner-toolbar"); + if ( toolbar ) { + toolbar.style.display = "block"; + id("qunit-filter-pass").disabled = null; + id("qunit-filter-missing").disabled = null; + } + } + + } else { + for ( var i = 0; i < config.assertions.length; i++ ) { + if ( !config.assertions[i].result ) { + bad++; + config.stats.bad++; + config.moduleStats.bad++; + } + } + } + + QUnit.testDone( testName, bad, config.assertions.length ); + + if ( !window.setTimeout && !config.queue.length ) { + done(); + } + }); + + if ( window.setTimeout && !config.doneTimer ) { + config.doneTimer = window.setTimeout(function(){ + if ( !config.queue.length ) { + done(); + } else { + synchronize( done ); + } + }, 13); + } + }, + + /** + * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through. + */ + expect: function(asserts) { + config.expected = asserts; + }, + + /** + * Asserts true. + * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" ); + */ + ok: function(a, msg) { + QUnit.log(a, msg); + + config.assertions.push({ + result: !!a, + message: msg + }); + }, + + /** + * Checks that the first two arguments are equal, with an optional message. + * Prints out both actual and expected values. + * + * Prefered to ok( actual == expected, message ) + * + * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." ); + * + * @param Object actual + * @param Object expected + * @param String message (optional) + */ + equal: function(actual, expected, message) { + push(expected == actual, actual, expected, message); + }, + + notEqual: function(actual, expected, message) { + push(expected != actual, actual, expected, message); + }, + + deepEqual: function(a, b, message) { + push(QUnit.equiv(a, b), a, b, message); + }, + + notDeepEqual: function(a, b, message) { + push(!QUnit.equiv(a, b), a, b, message); + }, + + strictEqual: function(actual, expected, message) { + push(expected === actual, actual, expected, message); + }, + + notStrictEqual: function(actual, expected, message) { + push(expected !== actual, actual, expected, message); + }, + + start: function() { + // A slight delay, to avoid any current callbacks + if ( window.setTimeout ) { + window.setTimeout(function() { + if ( config.timeout ) { + clearTimeout(config.timeout); + } + + config.blocking = false; + process(); + }, 13); + } else { + config.blocking = false; + process(); + } + }, + + stop: function(timeout) { + config.blocking = true; + + if ( timeout && window.setTimeout ) { + config.timeout = window.setTimeout(function() { + QUnit.ok( false, "Test timed out" ); + QUnit.start(); + }, timeout); + } + }, + + /** + * Resets the test setup. Useful for tests that modify the DOM. + */ + reset: function() { + if ( window.jQuery ) { + jQuery("#main").html( config.fixture ); + jQuery.event.global = {}; + jQuery.ajaxSettings = extend({}, config.ajaxSettings); + } + }, + + /** + * Trigger an event on an element. + * + * @example triggerEvent( document.body, "click" ); + * + * @param DOMElement elem + * @param String type + */ + triggerEvent: function( elem, type, event ) { + if ( document.createEvent ) { + event = document.createEvent("MouseEvents"); + event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView, + 0, 0, 0, 0, 0, false, false, false, false, 0, null); + elem.dispatchEvent( event ); + + } else if ( elem.fireEvent ) { + elem.fireEvent("on"+type); + } + }, + + // Safe object type checking + is: function( type, obj ) { + return Object.prototype.toString.call( obj ) === "[object "+ type +"]"; + }, + + // Logging callbacks + done: function(failures, total) {}, + log: function(result, message) {}, + testStart: function(name) {}, + testDone: function(name, failures, total) {}, + moduleStart: function(name, testEnvironment) {}, + moduleDone: function(name, failures, total) {} +}; + +// Backwards compatibility, deprecated +QUnit.equals = QUnit.equal; +QUnit.same = QUnit.deepEqual; + +// Maintain internal state +var config = { + // The queue of tests to run + queue: [], + + // block until document ready + blocking: true +}; + +// Load paramaters +(function() { + var location = window.location || { search: "", protocol: "file:" }, + GETParams = location.search.slice(1).split('&'); + + for ( var i = 0; i < GETParams.length; i++ ) { + GETParams[i] = decodeURIComponent( GETParams[i] ); + if ( GETParams[i] === "noglobals" ) { + GETParams.splice( i, 1 ); + i--; + config.noglobals = true; + } else if ( GETParams[i].search('=') > -1 ) { + GETParams.splice( i, 1 ); + i--; + } + } + + // restrict modules/tests by get parameters + config.filters = GETParams; + + // Figure out if we're running the tests from a server or not + QUnit.isLocal = !!(location.protocol === 'file:'); +})(); + +// Expose the API as global variables, unless an 'exports' +// object exists, in that case we assume we're in CommonJS +if ( typeof exports === "undefined" || typeof require === "undefined" ) { + extend(window, QUnit); + window.QUnit = QUnit; +} else { + extend(exports, QUnit); + exports.QUnit = QUnit; +} + +if ( typeof document === "undefined" || document.readyState === "complete" ) { + config.autorun = true; +} + +addEvent(window, "load", function() { + // Initialize the config, saving the execution queue + var oldconfig = extend({}, config); + QUnit.init(); + extend(config, oldconfig); + + config.blocking = false; + + var userAgent = id("qunit-userAgent"); + if ( userAgent ) { + userAgent.innerHTML = navigator.userAgent; + } + + var toolbar = id("qunit-testrunner-toolbar"); + if ( toolbar ) { + toolbar.style.display = "none"; + + var filter = document.createElement("input"); + filter.type = "checkbox"; + filter.id = "qunit-filter-pass"; + filter.disabled = true; + addEvent( filter, "click", function() { + var li = document.getElementsByTagName("li"); + for ( var i = 0; i < li.length; i++ ) { + if ( li[i].className.indexOf("pass") > -1 ) { + li[i].style.display = filter.checked ? "none" : ""; + } + } + }); + toolbar.appendChild( filter ); + + var label = document.createElement("label"); + label.setAttribute("for", "qunit-filter-pass"); + label.innerHTML = "Hide passed tests"; + toolbar.appendChild( label ); + + var missing = document.createElement("input"); + missing.type = "checkbox"; + missing.id = "qunit-filter-missing"; + missing.disabled = true; + addEvent( missing, "click", function() { + var li = document.getElementsByTagName("li"); + for ( var i = 0; i < li.length; i++ ) { + if ( li[i].className.indexOf("fail") > -1 && li[i].innerHTML.indexOf('missing test - untested code is broken code') > - 1 ) { + li[i].parentNode.parentNode.style.display = missing.checked ? "none" : "block"; + } + } + }); + toolbar.appendChild( missing ); + + label = document.createElement("label"); + label.setAttribute("for", "qunit-filter-missing"); + label.innerHTML = "Hide missing tests (untested code is broken code)"; + toolbar.appendChild( label ); + } + + var main = id('main'); + if ( main ) { + config.fixture = main.innerHTML; + } + + if ( window.jQuery ) { + config.ajaxSettings = window.jQuery.ajaxSettings; + } + + QUnit.start(); +}); + +function done() { + if ( config.doneTimer && window.clearTimeout ) { + window.clearTimeout( config.doneTimer ); + config.doneTimer = null; + } + + if ( config.queue.length ) { + config.doneTimer = window.setTimeout(function(){ + if ( !config.queue.length ) { + done(); + } else { + synchronize( done ); + } + }, 13); + + return; + } + + config.autorun = true; + + // Log the last module results + if ( config.currentModule ) { + QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all ); + } + + var banner = id("qunit-banner"), + tests = id("qunit-tests"), + html = ['Tests completed in ', + +new Date - config.started, ' milliseconds.<br/>', + '<span class="passed">', config.stats.all - config.stats.bad, '</span> tests of <span class="total">', config.stats.all, '</span> passed, <span class="failed">', config.stats.bad,'</span> failed.'].join(''); + + if ( banner ) { + banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass"); + } + + if ( tests ) { + var result = id("qunit-testresult"); + + if ( !result ) { + result = document.createElement("p"); + result.id = "qunit-testresult"; + result.className = "result"; + tests.parentNode.insertBefore( result, tests.nextSibling ); + } + + result.innerHTML = html; + } + + QUnit.done( config.stats.bad, config.stats.all ); +} + +function validTest( name ) { + var i = config.filters.length, + run = false; + + if ( !i ) { + return true; + } + + while ( i-- ) { + var filter = config.filters[i], + not = filter.charAt(0) == '!'; + + if ( not ) { + filter = filter.slice(1); + } + + if ( name.indexOf(filter) !== -1 ) { + return !not; + } + + if ( not ) { + run = true; + } + } + + return run; +} + +function push(result, actual, expected, message) { + message = message || (result ? "okay" : "failed"); + QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) ); +} + +function synchronize( callback ) { + config.queue.push( callback ); + + if ( config.autorun && !config.blocking ) { + process(); + } +} + +function process() { + while ( config.queue.length && !config.blocking ) { + config.queue.shift()(); + } +} + +function saveGlobal() { + config.pollution = []; + + if ( config.noglobals ) { + for ( var key in window ) { + config.pollution.push( key ); + } + } +} + +function checkPollution( name ) { + var old = config.pollution; + saveGlobal(); + + var newGlobals = diff( old, config.pollution ); + if ( newGlobals.length > 0 ) { + ok( false, "Introduced global variable(s): " + newGlobals.join(", ") ); + config.expected++; + } + + var deletedGlobals = diff( config.pollution, old ); + if ( deletedGlobals.length > 0 ) { + ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") ); + config.expected++; + } +} + +// returns a new Array with the elements that are in a but not in b +function diff( a, b ) { + var result = a.slice(); + for ( var i = 0; i < result.length; i++ ) { + for ( var j = 0; j < b.length; j++ ) { + if ( result[i] === b[j] ) { + result.splice(i, 1); + i--; + break; + } + } + } + return result; +} + +function fail(message, exception, callback) { + if ( typeof console !== "undefined" && console.error && console.warn ) { + console.error(message); + console.error(exception); + console.warn(callback.toString()); + + } else if ( window.opera && opera.postError ) { + opera.postError(message, exception, callback.toString); + } +} + +function extend(a, b) { + for ( var prop in b ) { + a[prop] = b[prop]; + } + + return a; +} + +function addEvent(elem, type, fn) { + if ( elem.addEventListener ) { + elem.addEventListener( type, fn, false ); + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, fn ); + } else { + fn(); + } +} + +function id(name) { + return !!(typeof document !== "undefined" && document && document.getElementById) && + document.getElementById( name ); +} + +// Test for equality any JavaScript type. +// Discussions and reference: http://philrathe.com/articles/equiv +// Test suites: http://philrathe.com/tests/equiv +// Author: Philippe Rathé <prathe(a)gmail.com> +QUnit.equiv = function () { + + var innerEquiv; // the real equiv function + var callers = []; // stack to decide between skip/abort functions + + + // Determine what is o. + function hoozit(o) { + if (QUnit.is("String", o)) { + return "string"; + + } else if (QUnit.is("Boolean", o)) { + return "boolean"; + + } else if (QUnit.is("Number", o)) { + + if (isNaN(o)) { + return "nan"; + } else { + return "number"; + } + + } else if (typeof o === "undefined") { + return "undefined"; + + // consider: typeof null === object + } else if (o === null) { + return "null"; + + // consider: typeof [] === object + } else if (QUnit.is( "Array", o)) { + return "array"; + + // consider: typeof new Date() === object + } else if (QUnit.is( "Date", o)) { + return "date"; + + // consider: /./ instanceof Object; + // /./ instanceof RegExp; + // typeof /./ === "function"; // => false in IE and Opera, + // true in FF and Safari + } else if (QUnit.is( "RegExp", o)) { + return "regexp"; + + } else if (typeof o === "object") { + return "object"; + + } else if (QUnit.is( "Function", o)) { + return "function"; + } else { + return undefined; + } + } + + // Call the o related callback with the given arguments. + function bindCallbacks(o, callbacks, args) { + var prop = hoozit(o); + if (prop) { + if (hoozit(callbacks[prop]) === "function") { + return callbacks[prop].apply(callbacks, args); + } else { + return callbacks[prop]; // or undefined + } + } + } + + var callbacks = function () { + + // for string, boolean, number and null + function useStrictEquality(b, a) { + if (b instanceof a.constructor || a instanceof b.constructor) { + // to catch short annotaion VS 'new' annotation of a declaration + // e.g. var i = 1; + // var j = new Number(1); + return a == b; + } else { + return a === b; + } + } + + return { + "string": useStrictEquality, + "boolean": useStrictEquality, + "number": useStrictEquality, + "null": useStrictEquality, + "undefined": useStrictEquality, + + "nan": function (b) { + return isNaN(b); + }, + + "date": function (b, a) { + return hoozit(b) === "date" && a.valueOf() === b.valueOf(); + }, + + "regexp": function (b, a) { + return hoozit(b) === "regexp" && + a.source === b.source && // the regex itself + a.global === b.global && // and its modifers (gmi) ... + a.ignoreCase === b.ignoreCase && + a.multiline === b.multiline; + }, + + // - skip when the property is a method of an instance (OOP) + // - abort otherwise, + // initial === would have catch identical references anyway + "function": function () { + var caller = callers[callers.length - 1]; + return caller !== Object && + typeof caller !== "undefined"; + }, + + "array": function (b, a) { + var i; + var len; + + // b could be an object literal here + if ( ! (hoozit(b) === "array")) { + return false; + } + + len = a.length; + if (len !== b.length) { // safe and faster + return false; + } + for (i = 0; i < len; i++) { + if ( ! innerEquiv(a[i], b[i])) { + return false; + } + } + return true; + }, + + "object": function (b, a) { + var i; + var eq = true; // unless we can proove it + var aProperties = [], bProperties = []; // collection of strings + + // comparing constructors is more strict than using instanceof + if ( a.constructor !== b.constructor) { + return false; + } + + // stack constructor before traversing properties + callers.push(a.constructor); + + for (i in a) { // be strict: don't ensures hasOwnProperty and go deep + + aProperties.push(i); // collect a's properties + + if ( ! innerEquiv(a[i], b[i])) { + eq = false; + break; + } + } + + callers.pop(); // unstack, we are done + + for (i in b) { + bProperties.push(i); // collect b's properties + } + + // Ensures identical properties name + return eq && innerEquiv(aProperties.sort(), bProperties.sort()); + } + }; + }(); + + innerEquiv = function () { // can take multiple arguments + var args = Array.prototype.slice.apply(arguments); + if (args.length < 2) { + return true; // end transition + } + + return (function (a, b) { + if (a === b) { + return true; // catch the most you can + } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) { + return false; // don't lose time with error prone cases + } else { + return bindCallbacks(a, callbacks, [b, a]); + } + + // apply transition with (1..n) arguments + })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1)); + }; + + return innerEquiv; + +}(); + +/** + * jsDump + * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com + * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php) + * Date: 5/15/2008 + * @projectDescription Advanced and extensible data dumping for Javascript. + * @version 1.0.0 + * @author Ariel Flesler + * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html} + */ +QUnit.jsDump = (function() { + function quote( str ) { + return '"' + str.toString().replace(/"/g, '\\"') + '"'; + }; + function literal( o ) { + return o + ''; + }; + function join( pre, arr, post ) { + var s = jsDump.separator(), + base = jsDump.indent(), + inner = jsDump.indent(1); + if ( arr.join ) + arr = arr.join( ',' + s + inner ); + if ( !arr ) + return pre + post; + return [ pre, inner + arr, base + post ].join(s); + }; + function array( arr ) { + var i = arr.length, ret = Array(i); + this.up(); + while ( i-- ) + ret[i] = this.parse( arr[i] ); + this.down(); + return join( '[', ret, ']' ); + }; + + var reName = /^function (\w+)/; + + var jsDump = { + parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance + var parser = this.parsers[ type || this.typeOf(obj) ]; + type = typeof parser; + + return type == 'function' ? parser.call( this, obj ) : + type == 'string' ? parser : + this.parsers.error; + }, + typeOf:function( obj ) { + var type; + if ( obj === null ) { + type = "null"; + } else if (typeof obj === "undefined") { + type = "undefined"; + } else if (QUnit.is("RegExp", obj)) { + type = "regexp"; + } else if (QUnit.is("Date", obj)) { + type = "date"; + } else if (QUnit.is("Function", obj)) { + type = "function"; + } else if (QUnit.is("Array", obj)) { + type = "array"; + } else if (QUnit.is("Window", obj) || QUnit.is("global", obj)) { + type = "window"; + } else if (QUnit.is("HTMLDocument", obj)) { + type = "document"; + } else if (QUnit.is("HTMLCollection", obj) || QUnit.is("NodeList", obj)) { + type = "nodelist"; + } else if (/^\[object HTML/.test(Object.prototype.toString.call( obj ))) { + type = "node"; + } else { + type = typeof obj; + } + return type; + }, + separator:function() { + return this.multiline ? this.HTML ? '<br />' : '\n' : this.HTML ? ' ' : ' '; + }, + indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing + if ( !this.multiline ) + return ''; + var chr = this.indentChar; + if ( this.HTML ) + chr = chr.replace(/\t/g,' ').replace(/ /g,' '); + return Array( this._depth_ + (extra||0) ).join(chr); + }, + up:function( a ) { + this._depth_ += a || 1; + }, + down:function( a ) { + this._depth_ -= a || 1; + }, + setParser:function( name, parser ) { + this.parsers[name] = parser; + }, + // The next 3 are exposed so you can use them + quote:quote, + literal:literal, + join:join, + // + _depth_: 1, + // This is the list of parsers, to modify them, use jsDump.setParser + parsers:{ + window: '[Window]', + document: '[Document]', + error:'[ERROR]', //when no parser is found, shouldn't happen + unknown: '[Unknown]', + 'null':'null', + undefined:'undefined', + 'function':function( fn ) { + var ret = 'function', + name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE + if ( name ) + ret += ' ' + name; + ret += '('; + + ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join(''); + return join( ret, this.parse(fn,'functionCode'), '}' ); + }, + array: array, + nodelist: array, + arguments: array, + object:function( map ) { + var ret = [ ]; + this.up(); + for ( var key in map ) + ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) ); + this.down(); + return join( '{', ret, '}' ); + }, + node:function( node ) { + var open = this.HTML ? '<' : '<', + close = this.HTML ? '>' : '>'; + + var tag = node.nodeName.toLowerCase(), + ret = open + tag; + + for ( var a in this.DOMAttrs ) { + var val = node[this.DOMAttrs[a]]; + if ( val ) + ret += ' ' + a + '=' + this.parse( val, 'attribute' ); + } + return ret + close + open + '/' + tag + close; + }, + functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function + var l = fn.length; + if ( !l ) return ''; + + var args = Array(l); + while ( l-- ) + args[l] = String.fromCharCode(97+l);//97 is 'a' + return ' ' + args.join(', ') + ' '; + }, + key:quote, //object calls it internally, the key part of an item in a map + functionCode:'[code]', //function calls it internally, it's the content of the function + attribute:quote, //node calls it internally, it's an html attribute value + string:quote, + date:quote, + regexp:literal, //regex + number:literal, + 'boolean':literal + }, + DOMAttrs:{//attributes to dump from nodes, name=>realName + id:'id', + name:'name', + 'class':'className' + }, + HTML:true,//if true, entities are escaped ( <, >, \t, space and \n ) + indentChar:' ',//indentation unit + multiline:true //if true, items in a collection, are separated by a \n, else just a space. + }; + + return jsDump; +})(); + +})(this); Added: trunk/examples/input-demo/src/main/webapp/resources/qunit/richfaces-qunit.js =================================================================== --- trunk/examples/input-demo/src/main/webapp/resources/qunit/richfaces-qunit.js (rev 0) +++ trunk/examples/input-demo/src/main/webapp/resources/qunit/richfaces-qunit.js 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,30 @@ +window.RichFaces = window.RichFaces || {}; +RichFaces.QUnit = (function(){ + var setTestHeader = function (header) { + var e = document.getElementById("qunit-header"); + e.innerHTML = header; + }; + + return { + appendDomElements: function (parent, html) { + var element = document.createElement("div"); + element.innerHTML = html; + var elements = [], e; + while (e = element.firstChild) { + elements.push(e); + parent.appendChild(e); + } + return elements; + }, + removeDomElements: function (elements) { + var element; + while (elements.length>0) { + element = elements.pop(); + element.parentNode.removeChild(element); + } + }, + run: function (f) { + jQuery(document).ready(f); + } + }; +}()); \ No newline at end of file Added: trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js =================================================================== --- trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js (rev 0) +++ trunk/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +RichFaces.QUnit.run(function() { + module("richfaces-autocomplete"); + + var AUTOCOMPLETE_ID = "form:myAutocomplete"; + + test("RichFaces.ui.Autocomplete constructor test", function () { + var c = RichFaces.$(AUTOCOMPLETE_ID); + + ok(c instanceof RichFaces.ui.AutocompleteBase, "inctance of RichFaces.ui.AutocompleteBase"); + ok(c instanceof RichFaces.ui.Autocomplete, "inctance of RichFaces.ui.Autocomplete"); + equals(c.id, AUTOCOMPLETE_ID, "id"); + // TODO other params + + }); + +/* + test("RichFaces.ui.Tab test public api", function () { + var c = RichFaces.$(TAB_ID); + + var PUBLIC_API = []; + + for (var i in PUBLIC_API) { + var funcName = PUBLIC_API[i]; + ok(c.[funcName], funcName + "present in component"); + // TODO check other functions + check is it function + } + }); + + test("RichFaces.ui.Tab test events", function () { + var componentId = TAB_ID; + var c = RichFaces.$(componentId); + + expect(5); + var beforeitemchngeHandler = function (event, comp, data) { + ok(true, "beforeitemchnge handler invouked"); + + same(data.id, componentId, "component id"); + same(data.oldItem.getName(), c.items[0].getName(), "old item"); + same(data.newItem.getName(), c.items[1].getName(), "new item"); + + return true; + }; + + var beforeitemchngeHandlerWrapper = RichFaces.Event.bindById(componentId, "beforeitemchange", beforeitemchngeHandler); + + var itemchangeHandler = handler("itemchnge handler invouked", undefined); + var itemchangeHandlerWrapper = RichFaces.Event.bindById(componentId, "itemchange", itemchangeHandler); + + c.switchToItem("name2"); + + RichFaces.Event.unbindById(componentId, "beforeitemchange", beforeitemchngeHandlerWrapper); + RichFaces.Event.unbindById(componentId, "itemchange", itemchangeHandlerWrapper); + + c.switchToItem("name1"); + }); + */ +}); Added: trunk/examples/input-demo/src/main/webapp/templates/template.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/templates/template.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/templates/template.xhtml 2010-09-27 16:36:34 UTC (rev 19346) @@ -0,0 +1,66 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" > + +<h:head> + <title> + <ui:define name="title">Application Title</ui:define> + </title> + + <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" /> +</h:head> + +<h:body> + + + <ui:insert name="scripts" ></ui:insert> + <table width="100%"> + <thead> + <tr> + <th width="20%" align="left">Content</th> + <th width="80%" align="left"> + <ui:insert name="body_head">Example</ui:insert> + </th> + </tr> + </thead> + <tbody> + <tr valign="top"> + <td> + <h:form id="nav"> + <p>Input Component's Examples</p> + <ul> + <li><h:commandLink value="rich:inplaceInput" action="inplaceInput" /></li> + <li><h:commandLink value="rich:inputNumberSlider" action="inputNumberSlider" /></li> + <li><h:commandLink value="rich:inputNumberSpinner" action="inputNumberSpinner" /></li> + <li><h:commandLink value="rich:autocomplete" action="autocomplete" /></li> + </ul> + + <h:panelGrid columns="3"> + <h:commandButton value="Classic"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="classic" /> + </h:commandButton> + <h:commandButton value="BlueSky"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="blueSky" /> + </h:commandButton> + <h:commandButton value="DeepMarine"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="deepMarine" /> + </h:commandButton> + </h:panelGrid> + + <p>QUnit tests</p> + <ul> + <li><h:commandLink value="rich:autocomplete qunit" action="qunit/autocomplete" /></li> + </ul> + </h:form> + </td> + <td> + <ui:insert name="body">Default content</ui:insert> + </td> + </tr> + </tbody> + </table> + +</h:body> +</html> \ No newline at end of file

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits September 2010