richfaces-svn-commits
December 2008
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 633 discussions
JBoss Rich Faces SVN: r11603 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-06 13:19:44 -0500 (Sat, 06 Dec 2008)
New Revision: 11603
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-2977
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-12-06 07:31:55 UTC (rev 11602)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-12-06 18:19:44 UTC (rev 11603)
@@ -121,6 +121,7 @@
Object key = table.getRowKey();
table.captureOrigValue(context);
table.setRowKey(context, null);
+ encodeCaption(context, table);
int columns = getColumnsCount(table);
// Encode colgroup definition.
writer.startElement("colgroup", table);
@@ -138,7 +139,6 @@
}
}
writer.endElement("colgroup");
- encodeCaption(context, table);
encodeHeader(context, table, columns);
encodeFooter(context, table, columns);
table.setRowKey(context,key);
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11602 - trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-06 02:31:55 -0500 (Sat, 06 Dec 2008)
New Revision: 11602
Modified:
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
https://jira.jboss.org/jira/browse/RF-5202
Modified: trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-12-06 07:09:43 UTC (rev 11601)
+++ trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-12-06 07:31:55 UTC (rev 11602)
@@ -64,7 +64,7 @@
new Insertion.Before(this.toolTip,
"<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.id + "iframe\"" +
"style=\"position: absolute; width: " + this.toolTipOffsetW + "px; height: " + this.toolTipOffsetH + "px; display: none;background-color:black; z-index: " +
- + (toolTipZindex-1) + ";\">" + "</iframe>");
+ (toolTipZindex-1) + ";\">" + "</iframe>");
this.iframe = $(this.id + 'iframe');
}
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11601 - in trunk/ui/core/src: test/java/org/ajax4jsf/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-06 02:09:43 -0500 (Sat, 06 Dec 2008)
New Revision: 11601
Modified:
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java
trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5216
Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-12-06 05:22:03 UTC (rev 11600)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-12-06 07:09:43 UTC (rev 11601)
@@ -79,11 +79,11 @@
Map<String, Object> queues = (Map<String, Object>) data;
ResponseWriter writer = context.getResponseWriter();
- writer.writeText("with (A4J.AJAX) {", null);
+ writer.writeText("if (A4J) { if (A4J.AJAX) { with (A4J.AJAX) {", null);
for (Entry<String, Object> entry : queues.entrySet()) {
encodeQueue(writer, entry.getKey(), (QueueRendererData) entry.getValue());
}
- writer.writeText("};", null);
+ writer.writeText("}}};", null);
}
protected void doEncode(InternetResource resource, FacesContext context,
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-12-06 05:22:03 UTC (rev 11600)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-12-06 07:09:43 UTC (rev 11601)
@@ -84,7 +84,7 @@
DomText text = (DomText) list.get(0);
String scriptData = text.getData();
- return scriptData.replaceAll("^\\Qwith (A4J.AJAX) {\\E|\\Q};\\E$", "");
+ return scriptData.replaceAll("^\\Qif (A4J) { if (A4J.AJAX) { with (A4J.AJAX) {\\E|\\Q}}};\\E$", "");
}
private String[] splitScript(String s) {
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11600 - trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-06 00:22:03 -0500 (Sat, 06 Dec 2008)
New Revision: 11600
Modified:
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-2073
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-12-06 05:21:31 UTC (rev 11599)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-12-06 05:22:03 UTC (rev 11600)
@@ -308,16 +308,15 @@
String clientId = listShuttle.getBaseClientId(context);
ExternalContext externalContext = context.getExternalContext();
- Map requestParameterMap = externalContext
- .getRequestParameterMap();
+ Map<String, String[]> requestParameterValuesMap = externalContext
+ .getRequestParameterValuesMap();
+ String[] strings = (String[]) requestParameterValuesMap.get(clientId);
-
- if (requestParameterMap.containsKey(clientId)) {
+ if (strings != null && strings.length != 0) {
Set sourceSelection = new HashSet();
Set targetSelection = new HashSet();
Object activeItem = null;
- String[] strings = (String[]) externalContext.getRequestParameterValuesMap().get(clientId);
Map map = new LinkedHashMap();
boolean facadeSource = true;
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11599 - trunk/ui/orderingList/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-06 00:21:31 -0500 (Sat, 06 Dec 2008)
New Revision: 11599
Modified:
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-2073
Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
===================================================================
--- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2008-12-06 05:07:58 UTC (rev 11598)
+++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2008-12-06 05:21:31 UTC (rev 11599)
@@ -249,13 +249,14 @@
String clientId = orderingList.getBaseClientId(context);
ExternalContext externalContext = context.getExternalContext();
- Map requestParameterMap = externalContext
- .getRequestParameterMap();
+ Map<String, String[]> requestParameterValuesMap = externalContext
+ .getRequestParameterValuesMap();
- if (requestParameterMap.containsKey(clientId)) {
+ String[] strings = (String[]) requestParameterValuesMap.get(clientId);
+
+ if (strings != null && strings.length != 0) {
Set selection = new HashSet();
Object activeItem = null;
- String[] strings = (String[]) externalContext.getRequestParameterValuesMap().get(clientId);
Map map = new LinkedHashMap();
Converter converter = getConverter(context, orderingList, false);
for (int i = 0; i < strings.length; i++) {
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11598 - trunk/ui/assembly/src/main/assembly.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-06 00:07:58 -0500 (Sat, 06 Dec 2008)
New Revision: 11598
Modified:
trunk/ui/assembly/src/main/assembly/src.xml
Log:
https://jira.jboss.org/jira/browse/RF-4789
https://jira.jboss.org/jira/browse/RF-4788
Modified: trunk/ui/assembly/src/main/assembly/src.xml
===================================================================
--- trunk/ui/assembly/src/main/assembly/src.xml 2008-12-06 04:45:07 UTC (rev 11597)
+++ trunk/ui/assembly/src/main/assembly/src.xml 2008-12-06 05:07:58 UTC (rev 11598)
@@ -6,6 +6,12 @@
</formats>
<fileSets>
<fileSet>
+ <includes>
+ <include>JBossORG-EULA.txt</include>
+ <include>lgpl.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${basedir}/../..</directory>
<outputDirectory>/</outputDirectory>
<excludes>
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11597 - in trunk/ui/assembly: src/main/assembly and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-05 23:45:07 -0500 (Fri, 05 Dec 2008)
New Revision: 11597
Added:
trunk/ui/assembly/JBossORG-EULA.txt
trunk/ui/assembly/lgpl.txt
Modified:
trunk/ui/assembly/src/main/assembly/richfaces.xml
Log:
https://jira.jboss.org/jira/browse/RF-4789
https://jira.jboss.org/jira/browse/RF-4788
Added: trunk/ui/assembly/JBossORG-EULA.txt
===================================================================
--- trunk/ui/assembly/JBossORG-EULA.txt (rev 0)
+++ trunk/ui/assembly/JBossORG-EULA.txt 2008-12-06 04:45:07 UTC (rev 11597)
@@ -0,0 +1,104 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006-2008 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
Added: trunk/ui/assembly/lgpl.txt
===================================================================
--- trunk/ui/assembly/lgpl.txt (rev 0)
+++ trunk/ui/assembly/lgpl.txt 2008-12-06 04:45:07 UTC (rev 11597)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library 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 library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Modified: trunk/ui/assembly/src/main/assembly/richfaces.xml
===================================================================
--- trunk/ui/assembly/src/main/assembly/richfaces.xml 2008-12-06 01:42:50 UTC (rev 11596)
+++ trunk/ui/assembly/src/main/assembly/richfaces.xml 2008-12-06 04:45:07 UTC (rev 11597)
@@ -10,6 +10,8 @@
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
+ <include>JBossORG-EULA.txt</include>
+ <include>lgpl.txt</include>
</includes>
</fileSet>
<fileSet>
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11596 - in trunk/samples/seamIntegration: src/main/java/org/ajax4jsf and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-12-05 20:42:50 -0500 (Fri, 05 Dec 2008)
New Revision: 11596
Added:
trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml
Modified:
trunk/samples/seamIntegration/pom.xml
trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml
Log:
https://jira.jboss.org/jira/browse/RF-4561 tests.
Modified: trunk/samples/seamIntegration/pom.xml
===================================================================
--- trunk/samples/seamIntegration/pom.xml 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/pom.xml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -13,7 +13,7 @@
<packaging>war</packaging>
<name>seamIntegration Maven Webapp</name>
<properties>
- <seam.version>2.1.1-SNAPSHOT</seam.version>
+ <seam.version>2.1.1-SNAPSHOT</seam.version>
</properties>
<build>
<finalName>seamIntegration</finalName>
@@ -86,6 +86,17 @@
<version>${seam.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.2.CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>${seam.version}</version>
@@ -106,5 +117,16 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>1.2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>1.2.10</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java
===================================================================
--- trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java 2008-12-06 01:42:50 UTC (rev 11596)
@@ -22,6 +22,7 @@
package org.ajax4jsf;
import java.io.Serializable;
+import java.util.Date;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -45,8 +46,40 @@
private static final long serialVersionUID = -4209339000953631111L;
private String text;
private String text2;
+
+ private Date date;
+
+ private Date date1 = new Date();
/**
+ * @return the date
+ */
+ public Date getDate() {
+ return date;
+ }
+
+ /**
+ * @param date the date to set
+ */
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ /**
+ * @return the date1
+ */
+ public Date getDate1() {
+ return date1;
+ }
+
+ /**
+ * @param date1 the date1 to set
+ */
+ public void setDate1(Date date1) {
+ this.date1 = date1;
+ }
+
+ /**
* @return the text
*/
public String getText() {
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -13,6 +13,8 @@
<!--
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-->
+ <default-render-kit-id>
+ org.apache.myfaces.trinidad.core
+ </default-render-kit-id>
</application>
-
</faces-config>
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -1,17 +1,19 @@
<?xml version="1.0" ?>
-<web-app version="2.5"
- 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-app_2_5.xsd">
+<web-app version="2.5" 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-app_2_5.xsd">
<!-- Ajax4jsf -->
-
+ <!--
+ <context-param> <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ -->
<context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name>
<param-value>com.sun.facelets.FaceletViewHandler</param-value>
</context-param>
-
<context-param>
<param-name>org.ajax4jsf.SKIN</param-name>
<param-value>blueSky</param-value>
@@ -22,64 +24,75 @@
</context-param>
<!-- Seam -->
-
<listener>
- <listener-class>
- org.jboss.seam.servlet.SeamListener
- </listener-class>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
</listener>
-
<filter>
<filter-name>Seam Filter</filter-name>
<filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
</filter>
-
<filter-mapping>
<filter-name>Seam Filter</filter-name>
- <url-pattern>/*</url-pattern>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+ <filter>
+ <filter-name>trinidad</filter-name>
+ <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>trinidad</filter-name>
+ <!-- This assumes that the FacesServlet has been registered -->
+ <!-- under the name "faces" -->
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
<servlet>
<servlet-name>Seam Resource Servlet</servlet-name>
- <servlet-class>
- org.jboss.seam.servlet.SeamResourceServlet
- </servlet-class>
+ <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
</servlet>
-
<servlet-mapping>
<servlet-name>Seam Resource Servlet</servlet-name>
<url-pattern>/seam/resource/*</url-pattern>
</servlet-mapping>
<!-- Facelets development mode (disable in production) -->
-
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>true</param-value>
</context-param>
<!-- JSF -->
-
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
-
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.seam</url-pattern>
</servlet-mapping>
-
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
-
-
-</web-app>
+ <servlet>
+ <servlet-name>resources</servlet-name>
+ <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
+ </servlet>
+ <!-- This cannot be configured currently -->
+ <servlet-mapping>
+ <servlet-name>resources</servlet-name>
+ <url-pattern>/adf/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml (rev 0)
+++ trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<f:view xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad">
+ <tr:document title="InputText Demo">
+ <tr:form>
+ <tr:panelGroupLayout layout="vertical">
+ <f:facet name="separator">
+ <tr:separator/>
+ </f:facet>
+ <tr:panelGroupLayout layout="horizontal">
+ <tr:commandLink immediate="true" text="Component Guide" action="guide"/>
+ <tr:spacer width="10"/>
+ <tr:goLink destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/tr_inputText.html"
+ text="Tag Documentation"/>
+ <tr:spacer width="10"/>
+ <tr:goLink destination="http://myfaces.apache.org/trinidad/skin-selectors.html#inputText"
+ text="Skinning Key Documentation"/>
+ </tr:panelGroupLayout>
+ <tr:outputFormatted styleUsage="instruction" value="<b>inputText</b>"/>
+ <tr:inputText label="Label" value="Some text"/>
+ <tr:commandButton text="Submit"/>
+ <tr:outputFormatted styleUsage="instruction"
+ value="<b>InputText Bound To Date</b>"/>
+ <tr:inputText label="Label2" value="#{seamBean.date1}" autoSubmit="true">
+ <f:convertDateTime dateStyle="long"/>
+ </tr:inputText>
+ <a4j:commandButton value="RichFaces AJAX Submit" reRender="output"/>
+ <tr:outputText styleClass="AFInstructionText" value="The submitted value was: "/>
+ <tr:outputText id="output" value="#{seamBean.date1}"/>
+ <tr:outputFormatted styleUsage="instruction"
+ value="<b>InputText with help facet</b>"/>
+ <tr:inputText label="Label3">
+ <f:facet name="help">
+ <tr:outputText value="Help facet text"/>
+ </f:facet>
+ </tr:inputText>
+ </tr:panelGroupLayout>
+ </tr:form>
+ </tr:document>
+</f:view>
\ No newline at end of file
Property changes on: trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11595 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-12-05 13:20:20 -0500 (Fri, 05 Dec 2008)
New Revision: 11595
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5247
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-05 18:12:58 UTC (rev 11594)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-05 18:20:20 UTC (rev 11595)
@@ -555,6 +555,72 @@
Assert.assertEquals(currentDate, month_year, "Calendar shows wrong current date");
}
+ @Test
+ public void testDatePatternNonPopupMode(Template template) {
+ renderPage(template, null);
+ initIds(getParentId());
+ String originalPattern = "MM/dd/yyyy HH:mm";
+ writeStatus("Check 'datePattern' attribute in non-popup mode");
+
+ String selectedDate = "03/03/2007 11:00";
+ String expectedSelectedDate = "03/2007";
+ String expectedPattern = "MM/yyyy";
+
+ setValueById(selectedDateId, selectedDate);
+ setValueById(currentDateId, "");
+ setValueById(datePatternId, expectedPattern);
+ setPopup(false);
+ setup();
+
+ try {
+ writeStatus("Check displayed date. It should be in 'MM/yyyy' format - time part is not visible at all");
+ String date = selenium.getText(dateSelectionXpath);
+ Assert.assertEquals(date, expectedSelectedDate, "Calendar shows date in wrong format");
+ Assert.assertFalse(isVisible(timeSelectionXpathMinusDiv), "Time part has to be invisible");
+ } catch (AssertionError ae) {
+ Assert.fail(ae.getMessage());
+ } finally {
+ setValueById(datePatternId, originalPattern);
+ setup();
+ }
+ }
+
+ @Test
+ public void testDatePatternPopupMode(Template template) {
+ renderPage(template, null);
+ initIds(getParentId());
+ String originalPattern = "MM/dd/yyyy HH:mm";
+ writeStatus("Check 'datePattern' attribute in popup mode");
+
+ String selectedDate = "03/03/2007 11:00";
+ String expectedSelectedDate = "03/2007";
+ String expectedPattern = "MM/yyyy";
+
+ setValueById(selectedDateId, selectedDate);
+ setValueById(currentDateId, "");
+ setValueById(datePatternId, expectedPattern);
+
+ setPopup(true);
+ setup();
+ showPopup();
+
+ try {
+ writeStatus("Check calendar popup is shown up and date in the input field is in proper format");
+ Assert.assertTrue(isVisible(calendarId), "Calendar popup is not visible");
+ AssertValueEquals(inputDateId, expectedSelectedDate, "Calendar input field shows wrong date");
+
+ writeStatus("Check displayed date again. It as before should be in 'MM/yyyy' format - time part is not visible at all");
+ String date = selenium.getText(dateSelectionXpath);
+ Assert.assertEquals(date, expectedSelectedDate, "Calendar shows date in wrong format");
+ Assert.assertFalse(isVisible(timeSelectionXpathMinusDiv), "Time part has to be invisible");
+ } catch (AssertionError ae) {
+ Assert.fail(ae.getMessage());
+ } finally {
+ setValueById(datePatternId, originalPattern);
+ setup();
+ }
+ }
+
private void setPopup(boolean isPopup) {
runScript("$('" + isPopupId + "').checked=" + isPopup);
}
16 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r11594 - in trunk/ui/inputnumber-slider/src/main: java/org/richfaces/renderkit and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-05 13:12:58 -0500 (Fri, 05 Dec 2008)
New Revision: 11594
Added:
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageLeft.java
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageRight.java
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageTop.java
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageLeft.java
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageRight.java
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageTop.java
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderTrackGradientVertical.java
Modified:
trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml
trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
Log:
https://jira.jboss.org/jira/browse/RF-5266
Modified: trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml
===================================================================
--- trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml 2008-12-05 17:46:45 UTC (rev 11593)
+++ trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml 2008-12-05 18:12:58 UTC (rev 11594)
@@ -44,41 +44,60 @@
-->
<property>
- <name> value </name>
- <classname>java.lang.String</classname>
- <description> Value to set as a result of working with a slider control</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
- </property>
+ <name>orientation</name>
+ <classname>java.lang.String</classname>
+ <description>Attribute can have the values "vertical" and "horizontal" to define in which direction the slider should be moveable.</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>showArrows</name>
+ <classname>boolean</classname>
+ <description>False value for this attribute makes increase/decrease arrows invisible. Default value is "false".</description>
+ <defaultvalue>false</defaultvalue>
+ </property>
+ <property>
+ <name>delay</name>
+ <classname>int</classname>
+ <description>Delay in pressed increase/decrease arrows in miliseconds. Default value is "200". </description>
+ <defaultvalue><![CDATA[200]]></defaultvalue>
+ </property>
+ <property>
+ <name>value</name>
+ <classname>java.lang.String</classname>
+ <description>Value to set as a result of working with a slider control</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>minValue</name>
+ <classname>java.lang.String</classname>
+ <description>Attribute to set the "start" value. Default value is "0". </description>
+ <defaultvalue><![CDATA["0"]]></defaultvalue>
+ </property>
+ <property>
+ <name>maxValue</name>
+ <classname>java.lang.String</classname>
+ <description>Attribute to set an "end" value. Default value is "100" </description>
+ <defaultvalue><![CDATA["100"]]></defaultvalue>
+ </property>
+ <property>
+ <name>step</name>
+ <classname>java.lang.String</classname>
+ <description>Parameter that determines a step between the nearest values while using a handle. Default value is "1".</description>
+ <defaultvalue><![CDATA["1"]]></defaultvalue>
+ </property>
+ <property>
+ <name>width</name>
+ <classname>java.lang.String</classname>
+ <description>The width of a slider control. Default value is "200px", for orientation="vertical" value is "20px"</description>
+ <defaultvalue><![CDATA["200px"]]></defaultvalue>
+ </property>
+ <property >
+ <name>height</name>
+ <classname>java.lang.String</classname>
+ <description>The height of a slider control. Default value is "20px", for orientation="vertical" value is "200px"</description>
+ <defaultvalue><![CDATA["20px"]]></defaultvalue>
+ </property>
<property>
- <name> minValue </name>
- <classname>java.lang.String</classname>
- <description> Attribute to set the "start" value. Default value is "0". </description>
- <defaultvalue><![CDATA["0"]]></defaultvalue>
- </property>
- <property>
- <name> maxValue </name>
- <classname>java.lang.String</classname>
- <description>Attribute to set an "end" value. Default value is "100" </description>
- <defaultvalue><![CDATA["100"]]></defaultvalue>
- </property>
- <property>
- <name> step </name>
- <classname>java.lang.String</classname>
- <description>Parameter that determines a step between the nearest values while using a handle. Default value is "1".</description>
- <defaultvalue><![CDATA["1"]]></defaultvalue>
- </property>
- <property>
- <name> width </name>
- <classname>java.lang.String</classname>
- <description> The width of a slider control. Default value is "200px"</description>
- <defaultvalue><![CDATA["200px"]]></defaultvalue>
- </property>
- <property hidden="true">
- <name> height </name>
- <classname>java.lang.String</classname>
- <description> The height of a slider control</description>
- </property>
- <property>
<name> enableManualInput </name>
<classname>boolean</classname>
<description>If set to "false" this attribute makes the text field "read-only", so the value can be
@@ -211,6 +230,44 @@
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
+ <name>increaseStyle</name>
+ <classname>java.lang.String</classname>
+ <description>A style for the increase arrow element
+ </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>increaseClass</name>
+ <classname>java.lang.String</classname>
+ <description>A name of CSS class for increase arrow element</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>increaseSelectedClass</name>
+ <classname>java.lang.String</classname>
+ <description>A name of CSS class for a selected control increase arrow element</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>decreaseStyle</name>
+ <classname>java.lang.String</classname>
+ <description>A style for the decrease arrow element
+ </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>decreaseClass</name>
+ <classname>java.lang.String</classname>
+ <description>A name of CSS class for the decrease arrow element</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>decreaseSelectedClass</name>
+ <classname>java.lang.String</classname>
+ <description>A name of CSS class for a selected control decrease arrow element</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
<name>converterMessage</name>
<classname>java.lang.String</classname>
<description>
Modified: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java 2008-12-05 17:46:45 UTC (rev 11593)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -55,10 +55,20 @@
public void prepareVariables(FacesContext context, UIInputNumberSlider slider) {
ComponentVariables variables = ComponentsVariableResolver.getVariables(this, slider);
- String inputPosition = (String)slider.getAttributes().get("inputPosition");
- if (!"right".equals(inputPosition) && !"left".equals(inputPosition)) {
+ String inputPosition = (String) slider.getAttributes().get(
+ "inputPosition");
+ if (!"right".equals(inputPosition) && !"left".equals(inputPosition)
+ && !"top".equals(inputPosition)
+ && !"bottom".equals(inputPosition)) {
inputPosition = "right";
}
+ if ("bottom".equals(inputPosition)) {
+ inputPosition = "left";
+ }
+ if ("top".equals(inputPosition)) {
+ inputPosition = "right";
+ }
+
variables.setVariable("inputPosition", inputPosition);
boolean disabled = attributeToBoolean(slider, "disabled");
@@ -78,6 +88,12 @@
variables.setVariable("inputSize", slider.getAttributes().get("inputSize"));
variables.setVariable("style", getStyleValue(slider));
+
+ variables.setVariable("orientation", slider.getAttributes().get(
+ "orientation"));
+ boolean showArrows = attributeToBoolean(slider, "showArrows");
+ variables.setVariable("showArrows", new Boolean(showArrows));
+ variables.setVariable("delay", slider.getAttributes().get("delay"));
}
public String getStyleValue(UIInputNumberSlider slider) {
Added: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageLeft.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageLeft.java (rev 0)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageLeft.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -0,0 +1,52 @@
+/**
+* License Agreement.
+*
+* JBoss RichFaces - Ajax4jsf Component Library
+*
+* Copyright (C) 2008 CompuGROUP Holding AG
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License version 2.1 as published by the Free Software Foundation.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+
+import org.ajax4jsf.resource.ResourceContext;
+import org.richfaces.renderkit.html.images.SliderArrowImage;
+
+/**
+ * @author mpopiolek
+ *
+ */
+public class SliderArrowImageLeft extends SliderArrowImage {
+
+ @Override
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ Integer color = (Integer) restoreData(context);
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setColor(new Color(color.intValue()));
+ g2d.drawLine(4, 0, 4, 0);
+ g2d.drawLine(3, 1, 4, 1);
+ g2d.drawLine(2, 2, 4, 2);
+ g2d.drawLine(1, 3, 4, 3);
+ g2d.drawLine(2, 4, 4, 4);
+ g2d.drawLine(3, 5, 4, 5);
+ g2d.drawLine(4, 6, 4, 6);
+ }
+}
Added: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageRight.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageRight.java (rev 0)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageRight.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -0,0 +1,52 @@
+/**
+* License Agreement.
+*
+* JBoss RichFaces - Ajax4jsf Component Library
+*
+* Copyright (C) 2008 CompuGROUP Holding AG
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License version 2.1 as published by the Free Software Foundation.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+
+import org.ajax4jsf.resource.ResourceContext;
+import org.richfaces.renderkit.html.images.SliderArrowImage;
+
+/**
+ * @author mpopiolek
+ *
+ */
+public class SliderArrowImageRight extends SliderArrowImage {
+
+ @Override
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ Integer color = (Integer) restoreData(context);
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setColor(new Color(color.intValue()));
+ g2d.drawLine(1, 0, 1, 0);
+ g2d.drawLine(1, 1, 2, 1);
+ g2d.drawLine(1, 2, 3, 2);
+ g2d.drawLine(1, 3, 4, 3);
+ g2d.drawLine(1, 4, 3, 4);
+ g2d.drawLine(1, 5, 2, 5);
+ g2d.drawLine(1, 6, 1, 6);
+ }
+}
Added: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageTop.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageTop.java (rev 0)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowImageTop.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -0,0 +1,48 @@
+/**
+* License Agreement.
+*
+* JBoss RichFaces - Ajax4jsf Component Library
+*
+* Copyright (C) 2008 CompuGROUP Holding AG
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License version 2.1 as published by the Free Software Foundation.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+
+import org.ajax4jsf.resource.ResourceContext;
+import org.richfaces.renderkit.html.images.SliderArrowImage;
+
+/**
+ * @author mpopiolek
+ *
+ */
+public class SliderArrowImageTop extends SliderArrowImage {
+
+ @Override
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ Integer color = (Integer) restoreData(context);
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setColor(new Color(color.intValue()));
+ g2d.drawLine(3,2,3,2);
+ g2d.drawLine(2,3,4,3);
+ g2d.drawLine(1,4,5,4);
+ g2d.drawLine(0,5,6,5);
+ }
+}
Added: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageLeft.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageLeft.java (rev 0)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageLeft.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -0,0 +1,48 @@
+/**
+* License Agreement.
+*
+* JBoss RichFaces - Ajax4jsf Component Library
+*
+* Copyright (C) 2008 CompuGROUP Holding AG
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License version 2.1 as published by the Free Software Foundation.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+package org.richfaces.renderkit.html.images;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.util.HtmlColor;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+/**
+ * @author mpopiolek
+ *
+ */
+public class SliderArrowSelectedImageLeft extends SliderArrowImageLeft {
+ protected Object getDataToStore(FacesContext context, Object data) {
+ Skin skin = SkinFactory.getInstance().getSkin(context);
+
+ String skinParameter = "tipBorderColor";
+ String tmp = (String) skin.getParameter(context, skinParameter);
+ if (null == tmp || "".equals(tmp)) {
+ Skin defaultSkin = SkinFactory.getInstance()
+ .getDefaultSkin(context);
+ tmp = (String) defaultSkin.getParameter(context, skinParameter);
+ }
+ int intValue = HtmlColor.decode(tmp == null ? "#000000" : tmp).getRGB();
+ return new Integer(intValue);
+ }
+}
Added: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageRight.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageRight.java (rev 0)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageRight.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -0,0 +1,48 @@
+/**
+* License Agreement.
+*
+* JBoss RichFaces - Ajax4jsf Component Library
+*
+* Copyright (C) 2008 CompuGROUP Holding AG
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License version 2.1 as published by the Free Software Foundation.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+package org.richfaces.renderkit.html.images;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.util.HtmlColor;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+/**
+ * @author mpopiolek
+ *
+ */
+public class SliderArrowSelectedImageRight extends SliderArrowImageRight {
+ protected Object getDataToStore(FacesContext context, Object data) {
+ Skin skin = SkinFactory.getInstance().getSkin(context);
+
+ String skinParameter = "tipBorderColor";
+ String tmp = (String) skin.getParameter(context, skinParameter);
+ if (null == tmp || "".equals(tmp)) {
+ Skin defaultSkin = SkinFactory.getInstance()
+ .getDefaultSkin(context);
+ tmp = (String) defaultSkin.getParameter(context, skinParameter);
+ }
+ int intValue = HtmlColor.decode(tmp == null ? "#000000" : tmp).getRGB();
+ return new Integer(intValue);
+ }
+}
Added: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageTop.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageTop.java (rev 0)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderArrowSelectedImageTop.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -0,0 +1,48 @@
+/**
+* License Agreement.
+*
+* JBoss RichFaces - Ajax4jsf Component Library
+*
+* Copyright (C) 2008 CompuGROUP Holding AG
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License version 2.1 as published by the Free Software Foundation.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+package org.richfaces.renderkit.html.images;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.util.HtmlColor;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+/**
+ * @author mpopiolek
+ *
+ */
+public class SliderArrowSelectedImageTop extends SliderArrowImageTop {
+ protected Object getDataToStore(FacesContext context, Object data) {
+ Skin skin = SkinFactory.getInstance().getSkin(context);
+
+ String skinParameter = "tipBorderColor";
+ String tmp = (String) skin.getParameter(context, skinParameter);
+ if (null == tmp || "".equals(tmp)) {
+ Skin defaultSkin = SkinFactory.getInstance()
+ .getDefaultSkin(context);
+ tmp = (String) defaultSkin.getParameter(context, skinParameter);
+ }
+ int intValue = HtmlColor.decode(tmp == null ? "#000000" : tmp).getRGB();
+ return new Integer(intValue);
+ }
+}
Added: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderTrackGradientVertical.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderTrackGradientVertical.java (rev 0)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/html/images/SliderTrackGradientVertical.java 2008-12-05 18:12:58 UTC (rev 11594)
@@ -0,0 +1,34 @@
+/**
+* License Agreement.
+*
+* JBoss RichFaces - Ajax4jsf Component Library
+*
+* Copyright (C) 2008 CompuGROUP Holding AG
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License version 2.1 as published by the Free Software Foundation.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+package org.richfaces.renderkit.html.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author mpopiolek
+ *
+ */
+public class SliderTrackGradientVertical extends BaseGradient {
+ public SliderTrackGradientVertical() {
+ super(7, 10, 7, "tabBackgroundColor", "controlBackgroundColor", true);
+ }
+}
Modified: trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
===================================================================
--- trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2008-12-05 17:46:45 UTC (rev 11593)
+++ trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2008-12-05 18:12:58 UTC (rev 11594)
@@ -8,17 +8,25 @@
/*width : 200px;*/
height : 20px;
}
+.dr-insldr-vertical {
+ width : 20px;
+}
.dr-insldr-tip {
- position : absolute;
- white-space : nowrap;
- padding : 0px 2px 0px 2px;
- border : 1px solid;
+ position : absolute;
+ white-space : nowrap;
+ padding : 2px 2px 2px 2px;
+ border : 1px solid;
}
.dr-insldr-size {
width: 100%;
}
+.dr-insldr-size-height {
+ height: 100%;
+ width: 7px;
+ padding: 0px 3px;
+}
.dr-insldr-left-num {
text-align : left;
@@ -30,8 +38,30 @@
border-right : 1px solid;
padding : 0px 3px 0px 3px;
}
+.dr-insldr-top-num {
+ text-align : left;
+ border-top: 1px solid;
+ border-color: #C4C0B9;
+ color: #000000;
+ font-family: Arial,Verdana,sans-serif;
+ font-size: 11px;
+ line-height: 11px;
+ vertical-align: top;
+}
+.dr-insldr-bottom-num{
+ text-align : left;
+ border-bottom : 1px solid;
+ padding : 0px 3px 0px 3px;
+ border-color: #C4C0B9;
+ color: #000000;
+ font-family: Arial,Verdana,sans-serif;
+ font-size: 11px;
+ line-height: 11px;
+ vertical-align: bottom;
+}
.dr-insldr-vert-spacer{
- padding-top : 3px;
+ padding : 3px 0px;
+ vertical-align: bottom;
}
.dr-insldr-handler{
background-color : transparent;
@@ -42,6 +72,24 @@
text-align : center;
z-index : 1;
}
+
+.dr-insldr-handler-vertical {
+ background-color : transparent;
+ width : 7px;
+ height : 8px;
+ font-size : 1px;
+ position : absolute;
+ text-align : center;
+ z-index : 1;
+}
+
+.dr-insldr-tip {
+ position : absolute;
+ white-space : nowrap;
+ padding : 2px 2px 2px 2px;
+ border : 1px solid;
+}
+
.dr-insldr-handler-sel{
background-color : transparent;
width : 7px;
@@ -57,6 +105,14 @@
height : 8px;
font-size : 1px;
}
+.dr-insldr-track-vertical{
+ background-position: left top;
+ background-repeat: repeat-y;
+ height : 100%;
+ font-size : 1px;
+ width: 7px;
+ background-color:#FFFFFF;
+}
.dr-insldr-track-decor-1 {
height : 100%;
width : 100%;
@@ -80,6 +136,45 @@
.dr-insldr-field-right {
margin-left: 10px;
}
+.dr-insldr-field-top {
+ margin-bottom: 7px;
+}
+.dr-insldr-field-bottom {
+ margin-top: 7px;
+}
+.dr-insldr-arrow {
+ background-repeat:no-repeat;
+ width: 15px;
+ height: 15px;
+}
+.dr-insldr-dec-horizontal {
+ background-position: 5px 4px;
+}
+.dr-insldr-inc-horizontal {
+ background-position: 4px 4px;
+}
+.dr-insldr-inc-vertical {
+ background-position: 3px 5px;
+}
+.dr-insldr-dec-vertical {
+ background-position: 3px 3px;
+}
+.dr-insldr-dec-horizontal-sel {
+ background-position: 5px 4px;
+}
+.dr-insldr-inc-horizontal-sel {
+ background-position: 4px 4px;
+}
+.dr-insldr-inc-vertical-sel {
+ background-position: 3px 5px;
+}
+.dr-insldr-dec-vertical-sel {
+ background-position: 3px 3px;
+}
+.dr-insldr-td-arrow {
+ text-align: left;
+ vertical-align: bottom;
+}
]]>
</f:verbatim>
@@ -91,6 +186,13 @@
<u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
+ <u:selector name=".dr-insldr-tip-step">
+ <u:style name="background-color" skin="tipBackgroundColor"/>
+ <u:style name="border-color" skin="tipBorderColor"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ </u:selector>
+
<u:selector name=".dr-insldr-left-num">
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="font-size" skin="generalSizeFont"/>
@@ -123,12 +225,72 @@
<f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowImage" />
</u:style>
</u:selector>
+
+ <u:selector name=".dr-insldr-handler-vertical">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowImageRight" />
+ </u:style>
+ </u:selector>
+
+ <u:selector name=".dr-insldr-track-vertical">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderTrackGradientVertical" />
+ </u:style>
+ </u:selector>
+
+ <u:selector name=".dr-insldr-dec-horizontal">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowImageLeft" />
+ </u:style>
+ </u:selector>
+ <u:selector name=".dr-insldr-inc-horizontal">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowImageRight" />
+ </u:style>
+ </u:selector>
+ <u:selector name=".dr-insldr-inc-vertical">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowImageTop" />
+ </u:style>
+ </u:selector>
+ <u:selector name=".dr-insldr-dec-vertical">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowImage" />
+ </u:style>
+ </u:selector>
+
+ <u:selector name=".dr-insldr-dec-horizontal-sel">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageLeft" />
+ </u:style>
+ </u:selector>
+ <u:selector name=".dr-insldr-inc-horizontal-sel">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageRight" />
+ </u:style>
+ </u:selector>
+ <u:selector name=".dr-insldr-inc-vertical-sel">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageTop" />
+ </u:style>
+ </u:selector>
+ <u:selector name=".dr-insldr-dec-vertical-sel">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImage" />
+ </u:style>
+ </u:selector>
<u:selector name=".dr-insldr-handler-sel">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImage" />
</u:style>
</u:selector>
+
+ <u:selector name=".dr-insldr-handler-sel-vertical">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageRight" />
+ </u:style>
+ </u:selector>
<u:selector name=".dr-insldr-track-decor-2">
<u:style name="border-color" skin="controlBackgroundColor"/>
Modified: trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
===================================================================
--- trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2008-12-05 17:46:45 UTC (rev 11593)
+++ trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2008-12-05 18:12:58 UTC (rev 11594)
@@ -1,7 +1,7 @@
if(!window.Richfaces) window.Richfaces = {};
Richfaces.Slider = Class.create();
Richfaces.Slider.prototype = {
- initialize: function(handle, track, tip, table, handleSelectedClass, options) {
+ initialize: function(handle, track, tip, table, handleSelectedClass, increaseSelectedClass, decreaseSelectedClass, options) {
var slider = this;
this.handle = $( handle );
this.tip = $( tip );
@@ -13,13 +13,28 @@
//this.optionInput = $(this.optionsInputId) || document.getElementById(this.optionsInputId);
this.input = $( options.inputId ) || document.getElementsByName(options.inputId)[0];
+ if(options.showArrows){
+ this.arrowInc = $( options.arrowInc ) || document.getElementsByName(options.arrowInc)[0];
+ this.arrowDec = $( options.arrowDec ) || document.getElementsByName(options.arrowDec)[0];
+ this.tipArrowInc = $( options.tipArrowInc ) || document.getElementsByName(options.tipArrowInc)[0];
+ this.tipArrowDec = $( options.tipArrowDec ) || document.getElementsByName(options.tipArrowDec)[0];
+ }
this.options= options || {};
+ this.orientation = this.options.orientation;
+
this.classes = {};
this.classes.arrow = "dr-insldr-handler rich-inslider-handler";
this.classes.arrowSelected = "dr-insldr-handler-sel rich-inslider-handler-selected";
this.classes.temp = this.handle.className;
this.classes.base = " " + this.trim(this.classes.temp.replace("dr-insldr-handler rich-inslider-handler",""));
+
+ if(this.orientation=="vertical"){
+ this.classes.arrow = "dr-insldr-handler-vertical rich-inslider-handler-vertical";
+ this.classes.arrowSelected = "dr-insldr-handler-sel-vertical rich-inslider-handler-selected-vertical";
+ this.classes.base = " " + this.trim(this.classes.temp.replace("dr-insldr-handler-vertical rich-inslider-handler-vertical",""));
+ }
+
this.classes.handleSelected = " " + handleSelectedClass;
this.table = this.findTableForTrack(this.track);
@@ -32,6 +47,10 @@
this.minimum = this.options.minimum || this.range.start;
this.maximum = this.options.maximum || this.range.end;
this.digCount = 0;
+ this.delay = this.options.delay;
+ if("" == this.input.value){
+ this.input.value = this.options.minimum;
+ }
this.step = this.options.step;
if ( (this.step+"").indexOf(".")!=-1 ){
@@ -41,7 +60,11 @@
this.availableValues = this.calculateAvailableValues();
this.tip.maxlength = (this.maximum + "").length + (this.digCount != 0 ? this.digCount + 1 : 0);
-
+ if(this.options.showArrows){
+ this.tipArrowInc.maxlength = this.tip.maxlength;
+ this.tipArrowDec.maxlength = this.tip.maxlength;
+ }
+
this.handleLength = 9;
this.active = false;
@@ -60,6 +83,8 @@
this.eventWindowResized = this.windowResized.bindAsEventListener(this);
Event.observe(window, "resize", this.eventWindowResized);
+
+ this.period = "";
if(!this.options.disabled){
//this.eventMouseUp = this.endDrag.bindAsEventListener(this);
@@ -72,6 +97,12 @@
this.eventEditValidate = this.inputValidate.bindAsEventListener(this);
this.eventInputChange = this.inputChange.bindAsEventListener(this);
this.eventWindowMouseOut= this.windowMouseOut.bindAsEventListener(this);
+ this.eventIncrease = this.increase.bindAsEventListener(this);
+ this.eventDecrease = this.decrease.bindAsEventListener(this);
+ this.eventIncreaseDown = this.increaseDown.bindAsEventListener(this);
+ this.eventDecreaseDown = this.decreaseDown.bindAsEventListener(this);
+ this.eventIncreaseUp = this.increaseUp.bindAsEventListener(this);
+ this.eventDecreaseUp = this.decreaseUp.bindAsEventListener(this);
if (this.options.onerr) {
this.eventError = new Function("event","clientErrorMessage",this.options.onerr);
@@ -92,6 +123,12 @@
this.input.onchange = null;
}
Event.observe(this.input, "change", this.eventInputChange);
+ if(this.options.showArrows){
+ Event.observe(this.arrowInc, "mousedown", this.eventIncreaseDown);
+ Event.observe(this.arrowDec, "mousedown", this.eventDecreaseDown);
+ Event.observe(this.arrowInc, "mouseup", this.eventIncreaseUp);
+ Event.observe(this.arrowDec, "mouseup", this.eventDecreaseUp);
+ }
}
this.initialized = true;
@@ -110,6 +147,10 @@
{
this.handle = null;
this.tip = null;
+ this.tipArrowInc = null;
+ this.tipArrowDec = null;
+ this.arrowInc = null;
+ this.arrowDec = null;
this.track = null;
this.mainTable.component = null;
this.mainTable = null;
@@ -128,6 +169,16 @@
this.handle.style.visibility="visible";
this.prevValue = this.value;
this.valueChanged = false;
+ if(this.options.showArrows){
+ if(this.orientation=="vertical"){
+ this.tipArrowInc.style.left = (this.arrowInc.offsetWidth) + "px";
+ this.tipArrowDec.style.left = (this.arrowDec.offsetWidth) + "px";
+ //this.tipArrowDec.style.top = "-" + (this.arrowDec.offsetHeight) + "px";
+ } else {
+ this.tipArrowInc.style.top = "-" + (this.arrowInc.offsetHeight + 3) + "px";
+ this.tipArrowDec.style.top = "-" + (this.arrowDec.offsetHeight + 3) + "px";
+ }
+ }
},
calculateAvailableValues : function(){
@@ -213,32 +264,67 @@
if ((!this.editInFocus || newValue==sliderValue) && (this.required || "" != this.input.value || this.updating)){
this.input.value = this.value;
// this.optionInput.value = this.value;
- this.handle.style.left = this.translateToPx(this.value);
+ if(this.options.orientation == "vertical"){
+ this.handle.style.top = this.translateToPx(this.value);
+ } else {
+ this.handle.style.left = this.translateToPx(this.value);
+ }
} else
{
- this.handle.style.left = "-2px";
+ if(this.options.orientation == "vertical"){
+ this.handle.style.top = "-9px";
+ } else {
+ this.handle.style.left = "0px";
+ }
}
if (!this.tip.firstChild) {
this.tip.appendChild(window.document.createTextNode(this.value));
}
- this.tip.firstChild.nodeValue= this.value;
- this.tip.style.left = this.handle.offsetLeft /*+ this.handle.offsetWidth*/ + "px";
+ if(this.options.showArrows){
+ if (!this.tipArrowInc.firstChild) {
+ this.tipArrowInc.appendChild(window.document.createTextNode(this.value));
+ }
+ if (!this.tipArrowDec.firstChild) {
+ this.tipArrowDec.appendChild(window.document.createTextNode(this.value));
+ }
+ this.tipArrowInc.firstChild.nodeValue= this.value;
+ this.tipArrowDec.firstChild.nodeValue= this.value;
+ }
+
+ this.tip.firstChild.nodeValue= this.value;
+ if(this.options.orientation == "vertical"){
+ this.tip.style.top = (this.handle.offsetTop) + "px";
+ } else {
+ this.tip.style.left = this.handle.offsetLeft /*+ this.handle.offsetWidth*/ + "px";
+ }
},
translateToPx: function(value) {
+ if(this.options.orientation == "vertical"){
+ return Math.round(
+ ((this.maximumOffset() - this.handleLength)/(this.range.end-this.range.start)) *
+ (this.range.end - value) - this.maximumOffset()) + "px";
+ }
return Math.round(
((this.maximumOffset() - this.handleLength)/(this.range.end-this.range.start)) *
(value - this.range.start)) + "px";
},
translateToValue: function(offset) {
+ if(this.options.orientation == "vertical"){
+ return (this.range.end -((offset/(this.maximumOffset() - this.handleLength) *
+ (this.range.end-this.range.start))));
+ }
return ((offset/(this.maximumOffset() - this.handleLength) *
(this.range.end-this.range.start)) + this.range.start);
},
maximumOffset: function(){
+ if(this.options.orientation == "vertical"){
+ return this.removePx(this.track.style.height || this.track.offsetHeight || this.options.height);
+ }
return this.removePx(this.track.style.width || this.track.offsetWidth || this.options.width);
},
@@ -268,18 +354,33 @@
Richfaces.createEvent("mousedown", this.mainTable, null, null).fire();
this.active = true;
var handle = Event.element(event);
- var pointer = Event.pointerX(event);
+
+ var pointer;
+ if(this.orientation=="vertical"){
+ pointer = Event.pointerY(event);
+ } else {
+ pointer = Event.pointerX(event);
+ }
var offsets = Position.cumulativeOffset(this.track);
this.updating = true;
- var value = this.translateToValue( ( pointer - offsets[0] ) -(this.handleLength/2));
+ var value;
+ if(this.orientation=="vertical"){
+ value = this.translateToValue( ( pointer - offsets[1] ) -(this.handleLength/2));
+ } else {
+ value = this.translateToValue( ( pointer - offsets[0] ) -(this.handleLength/2));
+ }
if(this.invokeEvent("slide",event,this.getNearestValue(value),this.input)){
this.setValue(value);
}
this.updating = false;
var offsets = Position.cumulativeOffset(this.handle);
- this.offsetX = pointer - offsets[0];
+ if(this.orientation=="vertical"){
+ this.offsetX = pointer - offsets[1];
+ } else {
+ this.offsetX = pointer - offsets[0];
+ }
}
Event.stop(event);
}
@@ -296,10 +397,17 @@
},
draw: function(event) {
- var pointer = Event.pointerX(event);
- var offsets = Position.cumulativeOffset(this.track);
- pointer -= this.offsetX + offsets[0];
- this.setValue(this.translateToValue( pointer ));
+ if(this.orientation=="vertical"){
+ var pointer = Event.pointerY(event);
+ var offsets = Position.cumulativeOffset(this.track);
+ pointer -= this.offsetX + offsets[1];
+ this.setValue(this.translateToValue( pointer ));
+ } else{
+ var pointer = Event.pointerX(event);
+ var offsets = Position.cumulativeOffset(this.track);
+ pointer -= this.offsetX + offsets[0];
+ this.setValue(this.translateToValue( pointer ));
+ }
},
processMouseUp: function(event) {
@@ -344,6 +452,68 @@
return ret;
},
+ increase : function(event){
+ var v = parseFloat(this.value) + parseFloat(this.step);
+ this.setValue(Number( v < this.maximum ? v : this.maximum));
+ this.input.value = this.value;
+ if (this.eventChanged && this.isValueChanged()){
+ this.eventChanged(event);
+ }
+ },
+
+ decrease : function(event){
+ var v = parseFloat(this.value) - parseFloat(this.step);
+ this.setValue(Number(v > this.minimum ? v : this.minimum));
+ this.input.value = this.value;
+ if (this.eventChanged && this.isValueChanged()){
+ this.eventChanged(event);
+ }
+ },
+
+ increaseDown : function(event){
+ this.arrowButton = $(event.target);
+ this.arrowButton.className = this.arrowButton.className.replace("Class","SelectedClass").replace("al","al-sel");
+ window.document.onmouseup = this.eventIncreaseUp.bindAsEventListener(this);
+ if(!this.disabled){
+ if (this.options.currValue){
+ Element.show(this.tipArrowInc);
+ }
+ }
+ this.eventIncrease(event);
+ this._periodicalExecuter = new PeriodicalExecuter(this.eventIncrease,this.delay/1000);
+ },
+
+ decreaseDown : function(event){
+ this.arrowButton = $(event.target);
+ this.arrowButton.className = this.arrowButton.className.replace("Class","SelectedClass").replace("al","al-sel");
+ window.document.onmouseup = this.eventDecreaseUp.bindAsEventListener(this);
+ if(!this.disabled){
+ if (this.options.currValue){
+ Element.show(this.tipArrowDec);
+ }
+ }
+ this.eventDecrease(event);
+ this._periodicalExecuter = new PeriodicalExecuter(this.eventDecrease,this.delay/1000);
+ },
+
+ increaseUp : function(event){
+ this._periodicalExecuter.stop();
+ if (this.options.currValue){
+ Element.hide(this.tipArrowInc);
+ }
+ this.arrowButton.className = this.arrowButton.className.replace("SelectedClass","Class").replace("al-sel","al");
+ window.document.onmouseup = this.prevMouseUp;
+ },
+
+ decreaseUp : function(event){
+ this._periodicalExecuter.stop();
+ if (this.options.currValue){
+ Element.hide(this.tipArrowDec);
+ }
+ this.arrowButton.className = this.arrowButton.className.replace("SelectedClass","Class").replace("al-sel","al");
+ window.document.onmouseup = this.prevMouseUp;
+ },
+
inputChange: function(e) {
this.editInFocus = false;
if (isNaN(Number(this.input.value))){
Modified: trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
===================================================================
--- trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-12-05 17:46:45 UTC (rev 11593)
+++ trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-12-05 18:12:58 UTC (rev 11594)
@@ -5,6 +5,7 @@
xmlns:ui=" http://ajax4jsf.org/cdk/ui"
xmlns:u=" http://ajax4jsf.org/cdk/u"
xmlns:x=" http://ajax4jsf.org/cdk/x"
+ xmlns:h="http://jsf.exadel.com/header"
class="org.richfaces.renderkit.html.InputNumberSliderRenderer"
baseclass="org.richfaces.renderkit.InputNumberSliderRendererBase"
component="org.richfaces.component.UIInputNumberSlider"
@@ -13,8 +14,8 @@
<h:styles>css/slider.xcss</h:styles>
<h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),script/SliderScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js,/org/richfaces/renderkit/html/scripts/events.js</h:scripts>
- <f:clientid var="clientId"/>
-
+ <f:clientid var="clientId"/>
+
<f:call name="prepareVariables" />
<f:resource name="/org/richfaces/renderkit/html/images/spacer.gif" var="spacer" />
@@ -23,15 +24,292 @@
<jsp:scriptlet>
<![CDATA[
- String width = (String) component.getAttributes().get("width");
- if (width == null || width.length() == 0) {
- width = "200px";
- } else {
- width = HtmlUtil.qualifySize(width);
- }
- variables.setVariable("width", width);
- ]]>
+ String width = (String) component.getAttributes().get("width");
+ if (width == null || width.length() == 0) {
+ if ("vertical".equalsIgnoreCase((String)variables.getVariable("orientation"))) {
+ width = "20px";
+ } else {
+ width = "200px";
+ }
+ } else {
+ width = HtmlUtil.qualifySize(width);
+ }
+ variables.setVariable("width", width);
+ String height = (String) component.getAttributes().get("height");
+ if (height == null || height.length() == 0) {
+ if ("vertical".equalsIgnoreCase((String)variables.getVariable("orientation"))) {
+ height = "200px";
+ } else {
+ height = "20px";
+ }
+ } else {
+ height = HtmlUtil.qualifySize(height);
+ }
+ variables.setVariable("height", height);
+ ]]>
</jsp:scriptlet>
+
+ <jsp:scriptlet>
+ <![CDATA[
+ if ("vertical".equalsIgnoreCase((String)variables.getVariable("orientation"))) {
+
+ ]]>
+ </jsp:scriptlet>
+
+ <table id="#{clientId}" border="0" cellpadding="0" cellspacing="0" class="dr-insldr-vertical rich-slider #{component.attributes['styleClass']}"
+ style="height: #{height};#{style}" x:passThruWithExclusions="id,boundClass,tipClass,class,width,height,style,border">
+ <tbody>
+ <tr>
+ <jsp:scriptlet><![CDATA[
+ if ("right".equalsIgnoreCase((String)variables.getVariable("inputPosition"))) {
+ ]]></jsp:scriptlet>
+ <td style="text-align: left; vertical-align: bottom">
+ <jsp:scriptlet><![CDATA[
+ if (((Boolean)variables.getVariable("showInput")).booleanValue()) {
+ ]]></jsp:scriptlet>
+ <input id="#{clientId}Input"
+ name="#{clientId}"
+ value="#{this:getInputValue(context,component)}"
+ type="text"
+ class="dr-insldr-field dr-insldr-field-top rich-inslider-field #{component.attributes['inputClass']}"
+ style="#{component.attributes['inputStyle']}; #{color}"
+ readonly="#{inputReadOnly}"
+ disabled="#{inputDisabled}"
+ onselect="#{component.attributes['onselect']}"
+ onfocus="#{component.attributes['onfocus']}"
+ onblur="#{component.attributes['onblur']}"
+ accesskey="#{component.attributes['accesskey']}"
+ size="#{inputSize}"
+ maxlength="#{component.attributes['maxlength']}"
+
+ onclick='#{component.attributes["oninputclick"]}'
+ ondblclick='#{component.attributes["oninputdblclick"]}'
+ onkeydown='#{component.attributes["oninputkeydown"]}'
+ onkeypress='#{component.attributes["oninputkeypress"]}'
+ onkeyup='#{component.attributes["oninputkeyup"]}'
+ onmousedown='#{component.attributes["oninputmousedown"]}'
+ onmousemove='#{component.attributes["oninputmousemove"]}'
+ onmouseout='#{component.attributes["oninputmouseout"]}'
+ onmouseover='#{component.attributes["oninputmouseover"]}'
+ onmouseup='#{component.attributes["oninputmouseup"]}'
+ />
+ <jsp:scriptlet><![CDATA[
+ } else {
+ ]]></jsp:scriptlet>
+ <input id="#{clientId}Input"
+ name="#{clientId}"
+ value="#{this:getInputValue(context,component)}"
+ type="hidden"
+ />
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ </td>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ </tr>
+ <jsp:scriptlet><![CDATA[
+ if (((Boolean)variables.getVariable("showArrows")).booleanValue()) {
+ ]]></jsp:scriptlet>
+ <tr>
+ <td class="dr-insldr-td-arrow">
+ <div style="position : relative">
+ <div id="#{clientId}TipArrowInc" class="dr-insldr-tip rich-inslider-tip #{component.attributes['tipClass']}" style="display: none; #{component.attributes['tipStyle']}">
+ <jsp:scriptlet><![CDATA[
+ writer.write(" ");
+ ]]></jsp:scriptlet>
+ </div>
+ <div id="#{clientId}ArrowInc"
+ class="dr-insldr-inc-vertical dr-insldr-arrow #{component.attributes['increaseClass']}"
+ style="#{component.attributes['increaseStyle']}"
+ />
+ </div>
+ </td>
+ </tr>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ <tr>
+ <td style="height: 100%;">
+ <table border="0" cellpadding="0" cellspacing="0" style="height: 100%;">
+ <tbody>
+ <tr>
+ <td rowspan="2" id="#{clientId}Track" class="dr-insldr-size-height">
+ <div class="dr-insldr-track-vertical rich-inslider-track #{component.attributes['barClass']}"
+ style="#{component.attributes['barStyle']}">
+ <table class="dr-insldr-track-decor-1 rich-inslider-track-border" cellpadding="0" cellspacing="0" >
+ <tbody>
+ <tr style="height: 98%">
+ <td class="dr-insldr-track-decor-2">
+ <img src="#{spacer}" style="display: block;" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div style="position : relative">
+ <div id="#{clientId}Tip" class="dr-insldr-tip rich-inslider-tip #{component.attributes['tipClass']}" style="display: none;left: 9px; #{component.attributes['tipStyle']}">
+ <jsp:scriptlet><![CDATA[
+ writer.write(" ");
+ ]]></jsp:scriptlet>
+ </div>
+ <div class="dr-insldr-handler-vertical #{component.attributes['handleClass']}" id="#{clientId}Handle" style="visibility:visible; top: -7px; left:1px;">
+ <jsp:scriptlet><![CDATA[
+ writer.write(" ");
+ ]]></jsp:scriptlet>
+ </div>
+ </div>
+ </td>
+ <jsp:scriptlet><![CDATA[
+ if (attributeToBoolean(component, "showBoundaryValues")){
+ ]]></jsp:scriptlet>
+ <td class="dr-insldr-top-num #{component.attributes['boundClass']}">
+ #{component.attributes['maxValue']}
+ </td>
+ <jsp:scriptlet><![CDATA[
+ } else{
+ ]]></jsp:scriptlet>
+ <td></td>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ </tr>
+ <tr>
+ <jsp:scriptlet><![CDATA[
+ if (attributeToBoolean(component, "showBoundaryValues")){
+ ]]></jsp:scriptlet>
+ <td class="dr-insldr-bottom-num #{component.attributes['boundClass']}">
+ #{component.attributes['minValue']}
+ </td>
+ <jsp:scriptlet><![CDATA[
+ } else {
+ ]]></jsp:scriptlet>
+ <td></td>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ </tr>
+
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ <jsp:scriptlet><![CDATA[
+ if (((Boolean)variables.getVariable("showArrows")).booleanValue()) {
+ ]]></jsp:scriptlet>
+ <tr>
+ <td class="dr-insldr-td-arrow">
+ <div style="position : relative">
+ <div id="#{clientId}TipArrowDec" class="dr-insldr-tip rich-inslider-tip #{component.attributes['tipClass']}" style="display: none; #{component.attributes['tipStyle']}">
+ <jsp:scriptlet><![CDATA[
+ writer.write(" ");
+ ]]></jsp:scriptlet>
+ </div>
+ <div id="#{clientId}ArrowDec"
+ class="dr-insldr-dec-vertical dr-insldr-arrow #{component.attributes['decreaseClass']}"
+ style="#{component.attributes['decreaseStyle']}"
+ />
+ </div>
+ </td>
+ </tr>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ <tr>
+ <jsp:scriptlet><![CDATA[
+ if ("left".equalsIgnoreCase((String)variables.getVariable("inputPosition"))) {
+ ]]></jsp:scriptlet>
+ <td style="text-align: left; vertical-align: bottom">
+ <jsp:scriptlet><![CDATA[
+ if (((Boolean)variables.getVariable("showInput")).booleanValue()) {
+ ]]></jsp:scriptlet>
+ <input id="#{clientId}Input"
+ name="#{clientId}"
+ value="#{this:getInputValue(context,component)}"
+ type="text"
+ class="dr-insldr-field dr-insldr-field-bottom rich-inslider-field #{component.attributes['inputClass']}"
+ style="#{component.attributes['inputStyle']}; #{color}"
+ readonly="#{inputReadOnly}"
+ disabled="#{inputDisabled}"
+ onselect="#{component.attributes['onselect']}"
+ onfocus="#{component.attributes['onfocus']}"
+ onblur="#{component.attributes['onblur']}"
+ accesskey="#{component.attributes['accesskey']}"
+ size="#{inputSize}"
+ maxlength="#{component.attributes['maxlength']}"
+
+ onclick='#{component.attributes["oninputclick"]}'
+ ondblclick='#{component.attributes["oninputdblclick"]}'
+ onkeydown='#{component.attributes["oninputkeydown"]}'
+ onkeypress='#{component.attributes["oninputkeypress"]}'
+ onkeyup='#{component.attributes["oninputkeyup"]}'
+ onmousedown='#{component.attributes["oninputmousedown"]}'
+ onmousemove='#{component.attributes["oninputmousemove"]}'
+ onmouseout='#{component.attributes["oninputmouseout"]}'
+ onmouseover='#{component.attributes["oninputmouseover"]}'
+ onmouseup='#{component.attributes["oninputmouseup"]}'
+ />
+ <jsp:scriptlet><![CDATA[
+ } else {
+ ]]></jsp:scriptlet>
+ <input id="#{clientId}Input"
+ name="#{clientId}"
+ value="#{this:getInputValue(context,component)}"
+ type="hidden"
+ />
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ </td>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+ </tr>
+ <tr><td>
+ <script type="text/javascript">
+ new Richfaces.Slider(
+ "#{clientId}Handle",
+ "#{clientId}Track",
+ "#{clientId}Tip",
+ "#{clientId}",
+ "#{component.attributes['handleSelectedClass']}",
+ "#{component.attributes['decreaseSelectedClass']}",
+ "#{component.attributes['increaseSelectedClass']}",
+ {
+ range : $R(#{component.attributes['minValue']},#{component.attributes['maxValue']}),
+ step : "#{component.attributes['step']}",
+ sliderValue : "#{this:getInputValue(context,component)}",
+ disabled : #{component.attributes['disabled']},
+ currValue : #{component.attributes['showToolTip']},
+ inputId : "#{clientId}Input",
+ arrowInc : "#{clientId}ArrowInc",
+ arrowDec : "#{clientId}ArrowDec",
+ tipArrowInc : "#{clientId}TipArrowInc",
+ tipArrowDec : "#{clientId}TipArrowDec",
+ arrowSelected : "#{arrowSelected}",
+ onerr : "#{component.attributes['onerror']}",
+ clientErrorMsg : "#{component.attributes['clientErrorMessage']}",
+ <f:call name="writeEventHandlerFunction"><f:parameter value="onslide" /></f:call>,
+ onchange : "#{component.attributes['onchange']}",
+ required : #{component.attributes['required']},
+ height : "#{height}",
+ width : "#{width}",
+ orientation : "vertical",
+ showArrows : #{component.attributes['showArrows']},
+ delay : "#{component.attributes['delay']}"
+ })
+ </script>
+ </td></tr>
+ </tbody>
+ </table>
+
+ <jsp:scriptlet>
+ <![CDATA[
+ } else {
+ ]]>
+ </jsp:scriptlet>
+
<table id="#{clientId}" border="0" cellpadding="0" cellspacing="0" class="dr-insldr rich-slider #{component.attributes['styleClass']}"
style="width: #{width};#{style}" x:passThruWithExclusions="id,boundClass,tipClass,class,width,height,style,border">
<tbody>
@@ -56,17 +334,17 @@
onblur="#{component.attributes['onblur']}"
accesskey="#{component.attributes['accesskey']}"
size="#{inputSize}"
- maxlength="#{component.attributes['maxlength']}"
-
- onclick='#{component.attributes["oninputclick"]}'
- ondblclick='#{component.attributes["oninputdblclick"]}'
- onkeydown='#{component.attributes["oninputkeydown"]}'
- onkeypress='#{component.attributes["oninputkeypress"]}'
- onkeyup='#{component.attributes["oninputkeyup"]}'
- onmousedown='#{component.attributes["oninputmousedown"]}'
- onmousemove='#{component.attributes["oninputmousemove"]}'
- onmouseout='#{component.attributes["oninputmouseout"]}'
- onmouseover='#{component.attributes["oninputmouseover"]}'
+ maxlength="#{component.attributes['maxlength']}"
+
+ onclick='#{component.attributes["oninputclick"]}'
+ ondblclick='#{component.attributes["oninputdblclick"]}'
+ onkeydown='#{component.attributes["oninputkeydown"]}'
+ onkeypress='#{component.attributes["oninputkeypress"]}'
+ onkeyup='#{component.attributes["oninputkeyup"]}'
+ onmousedown='#{component.attributes["oninputmousedown"]}'
+ onmousemove='#{component.attributes["oninputmousemove"]}'
+ onmouseout='#{component.attributes["oninputmouseout"]}'
+ onmouseover='#{component.attributes["oninputmouseover"]}'
onmouseup='#{component.attributes["oninputmouseup"]}'
/>
<jsp:scriptlet><![CDATA[
@@ -85,6 +363,26 @@
}
]]></jsp:scriptlet>
+ <jsp:scriptlet><![CDATA[
+ if (((Boolean)variables.getVariable("showArrows")).booleanValue()) {
+ ]]></jsp:scriptlet>
+ <td rowspan="2" class="dr-insldr-td-arrow">
+ <div style="position : relative">
+ <div id="#{clientId}TipArrowDec" class="dr-insldr-tip rich-inslider-tip #{component.attributes['tipClass']}" style="display: none; #{component.attributes['tipStyle']}">
+ <jsp:scriptlet><![CDATA[
+ writer.write(" ");
+ ]]></jsp:scriptlet>
+ </div>
+ <div id="#{clientId}ArrowDec"
+ class="dr-insldr-dec-horizontal dr-insldr-arrow #{component.attributes['decreaseClass']}"
+ style="#{component.attributes['decreaseStyle']}"
+ />
+ </div>
+ </td>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
+
<td class="dr-insldr-left-num rich-inslider-left-num #{component.attributes['boundClass']}">
<jsp:scriptlet><![CDATA[
if (attributeToBoolean(component, "showBoundaryValues")){
@@ -103,6 +401,26 @@
}
]]></jsp:scriptlet>
</td>
+
+ <jsp:scriptlet><![CDATA[
+ if (((Boolean)variables.getVariable("showArrows")).booleanValue()) {
+ ]]></jsp:scriptlet>
+ <td rowspan="2" class="dr-insldr-td-arrow">
+ <div style="position : relative">
+ <div id="#{clientId}TipArrowInc" class="dr-insldr-tip rich-inslider-tip #{component.attributes['tipClass']}" style="display: none; #{component.attributes['tipStyle']}">
+ <jsp:scriptlet><![CDATA[
+ writer.write(" ");
+ ]]></jsp:scriptlet>
+ </div>
+ <div id="#{clientId}ArrowInc"
+ class="dr-insldr-inc-horizontal dr-insldr-arrow #{component.attributes['increaseClass']}"
+ style="#{component.attributes['increaseStyle']}"
+ />
+ </div>
+ </td>
+ <jsp:scriptlet><![CDATA[
+ }
+ ]]></jsp:scriptlet>
<jsp:scriptlet><![CDATA[
if ("right".equalsIgnoreCase((String)variables.getVariable("inputPosition"))) {
@@ -124,17 +442,17 @@
onblur="#{component.attributes['onblur']}"
accesskey="#{component.attributes['accesskey']}"
size="#{inputSize}"
- maxlength="#{component.attributes['maxlength']}"
-
- onclick='#{component.attributes["oninputclick"]}'
- ondblclick='#{component.attributes["oninputdblclick"]}'
- onkeydown='#{component.attributes["oninputkeydown"]}'
- onkeypress='#{component.attributes["oninputkeypress"]}'
- onkeyup='#{component.attributes["oninputkeyup"]}'
- onmousedown='#{component.attributes["oninputmousedown"]}'
- onmousemove='#{component.attributes["oninputmousemove"]}'
- onmouseout='#{component.attributes["oninputmouseout"]}'
- onmouseover='#{component.attributes["oninputmouseover"]}'
+ maxlength="#{component.attributes['maxlength']}"
+
+ onclick='#{component.attributes["oninputclick"]}'
+ ondblclick='#{component.attributes["oninputdblclick"]}'
+ onkeydown='#{component.attributes["oninputkeydown"]}'
+ onkeypress='#{component.attributes["oninputkeypress"]}'
+ onkeyup='#{component.attributes["oninputkeyup"]}'
+ onmousedown='#{component.attributes["oninputmousedown"]}'
+ onmousemove='#{component.attributes["oninputmousemove"]}'
+ onmouseout='#{component.attributes["oninputmouseout"]}'
+ onmouseover='#{component.attributes["oninputmouseover"]}'
onmouseup='#{component.attributes["oninputmouseup"]}'
/>
<jsp:scriptlet><![CDATA[
@@ -189,6 +507,8 @@
"#{clientId}Tip",
"#{clientId}",
"#{component.attributes['handleSelectedClass']}",
+ "#{component.attributes['increaseSelectedClass']}",
+ "#{component.attributes['decreaseSelectedClass']}",
{
range : $R(#{component.attributes['minValue']},#{component.attributes['maxValue']}),
step : "#{component.attributes['step']}",
@@ -196,13 +516,21 @@
disabled : #{component.attributes['disabled']},
currValue : #{component.attributes['showToolTip']},
inputId : "#{clientId}Input",
- arrowSelected : "#{arrowSelected}",
+ arrowInc : "#{clientId}ArrowInc",
+ arrowDec : "#{clientId}ArrowDec",
+ tipArrowInc : "#{clientId}TipArrowInc",
+ tipArrowDec : "#{clientId}TipArrowDec",
+ arrowSelected : "#{arrowSelected}",
onerr : "#{component.attributes['onerror']}",
clientErrorMsg : "#{component.attributes['clientErrorMessage']}",
<f:call name="writeEventHandlerFunction"><f:parameter value="onslide" /></f:call>,
onchange : "#{component.attributes['onchange']}",
required : #{component.attributes['required']},
- width : "#{width}"
+ width : "#{width}",
+ height : "#{height}",
+ orientation : "horizontal",
+ showArrows : #{component.attributes['showArrows']},
+ delay : "#{component.attributes['delay']}"
})
</script>
</td>
@@ -213,4 +541,11 @@
</tr>
</tbody>
</table>
+
+ <jsp:scriptlet>
+ <![CDATA[
+ }
+ ]]>
+ </jsp:scriptlet>
+
</f:root>
16 years, 1 month
- 1
- 0