richfaces-svn-commits
October 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 93 discussions
JBoss Rich Faces SVN: r22763 - in modules/tests/metamer/branches/wfk2-product-branch: application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-10-03 08:24:59 -0400 (Mon, 03 Oct 2011)
New Revision: 22763
Modified:
modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml
modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml
modules/tests/metamer/branches/wfk2-product-branch/pom.xml
Log:
Metamer version changed to 4.1.0.20110910-M2-redhat-1
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml 2011-10-03 12:19:44 UTC (rev 22762)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml 2011-10-03 12:24:59 UTC (rev 22763)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20110910-M2-redhat-1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-10-03 12:19:44 UTC (rev 22762)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-10-03 12:24:59 UTC (rev 22763)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20110910-M2-redhat-1</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
@@ -81,8 +81,8 @@
<properties>
<context.path>/metamer/</context.path>
<deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.1.0-SNAPSHOT</deployable.version>
- <ftest.source.version>4.1.0-SNAPSHOT</ftest.source.version>
+ <deployable.version>4.1.0.20110910-M2-redhat-1</deployable.version>
+ <ftest.source.version>4.1.0.20110910-M2-redhat-1</ftest.source.version>
<testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
<container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
<jsf.config>Mojarra-2.0</jsf.config>
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml 2011-10-03 12:19:44 UTC (rev 22762)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml 2011-10-03 12:24:59 UTC (rev 22763)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20110910-M2-redhat-1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/branches/wfk2-product-branch/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/pom.xml 2011-10-03 12:19:44 UTC (rev 22762)
+++ modules/tests/metamer/branches/wfk2-product-branch/pom.xml 2011-10-03 12:24:59 UTC (rev 22763)
@@ -26,12 +26,12 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-example-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20110910-M2</version>
</parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20110910-M2-redhat-1</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -124,7 +124,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.1.0-SNAPSHOT</version.richfaces>
+ <version.richfaces>4.1.0.20110910-M2-redhat-1</version.richfaces>
</properties>
<dependencyManagement>
13 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r22762 - sandbox/trunk/ui/watermark/ui/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: blabno
Date: 2011-10-03 08:19:44 -0400 (Mon, 03 Oct 2011)
New Revision: 22762
Modified:
sandbox/trunk/ui/watermark/ui/src/main/resources/META-INF/resources/jquery.watermark.js
Log:
Fixed problem with clearing watermarks on form ajax submit.
Modified: sandbox/trunk/ui/watermark/ui/src/main/resources/META-INF/resources/jquery.watermark.js
===================================================================
--- sandbox/trunk/ui/watermark/ui/src/main/resources/META-INF/resources/jquery.watermark.js 2011-10-03 10:09:06 UTC (rev 22761)
+++ sandbox/trunk/ui/watermark/ui/src/main/resources/META-INF/resources/jquery.watermark.js 2011-10-03 12:19:44 UTC (rev 22762)
@@ -447,53 +447,49 @@
// we need to replace the form's submit function with our own
// function. Otherwise watermarks won't be cleared when the form
// is submitted programmatically.
- if (this.form) {
- var form = this.form,
- $form = $(form);
-
- if (!$form.data(dataFormSubmit)) {
- $form.submit($.watermark.hideAll);
-
- // form.submit exists for all browsers except Google Chrome
- // (see "else" below for explanation)
- if (form.submit) {
- $form.data(dataFormSubmit, form.submit);
-
- form.submit = (function (f, $f) {
- return function () {
- var nativeSubmit = $f.data(dataFormSubmit);
-
- $.watermark.hideAll();
-
- if (nativeSubmit.apply) {
- nativeSubmit.apply(f, Array.prototype.slice.call(arguments));
- }
- else {
- nativeSubmit();
- }
- };
- })(form, $form);
- }
- else {
- $form.data(dataFormSubmit, 1);
-
- // This strangeness is due to the fact that Google Chrome's
- // form.submit function is not visible to JavaScript (identifies
- // as "undefined"). I had to invent a solution here because hours
- // of Googling (ironically) for an answer did not turn up anything
- // useful. Within my own form.submit function I delete the form's
- // submit function, and then call the non-existent function --
- // which, in the world of Google Chrome, still exists.
- form.submit = (function (f) {
- return function () {
- $.watermark.hideAll();
- delete f.submit;
- f.submit();
- };
- })(form);
- }
- }
- }
+ if (this.form) {
+ var form = this.form,
+ $form = $(form);
+
+ if (!$form.data(dataFormSubmit)) {
+ $form.submit($.watermark.hideAll);
+
+ // form.submit exists for all browsers except Google Chrome
+ // (see "else" below for explanation)
+ if (form.submit) {
+ $form.data(dataFormSubmit, form.onsubmit || 1);
+
+ form.onsubmit = (function (f, $f) {
+ return function () {
+ var nativeSubmit = $f.data(dataFormSubmit);
+ $.watermark.hideAll();
+ if (nativeSubmit instanceof Function) {
+ nativeSubmit();
+ } else {
+ eval(nativeSubmit);
+ }
+ };
+ })(form, $form);
+ } else {
+ $form.data(dataFormSubmit, 1);
+
+ // This strangeness is due to the fact that Google Chrome's
+ // form.submit function is not visible to JavaScript (identifies
+ // as "undefined"). I had to invent a solution here because hours
+ // of Googling (ironically) for an answer did not turn up anything
+ // useful. Within my own form.submit function I delete the form's
+ // submit function, and then call the non-existent function --
+ // which, in the world of Google Chrome, still exists.
+ form.submit = (function (f) {
+ return function () {
+ $.watermark.hideAll();
+ delete f.submit;
+ f.submit();
+ };
+ })(form);
+ }
+ }
+ }
}
$.watermark._show($input);
13 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r22761 - modules/tests/metamer/branches.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-10-03 06:09:06 -0400 (Mon, 03 Oct 2011)
New Revision: 22761
Added:
modules/tests/metamer/branches/wfk2-product-branch/
Log:
Branching from trunk to wf2-product-branch at 22760.
13 years, 2 months
- 1
- 0