[richfaces-svn-commits] JBoss Rich Faces SVN: r20816 - in trunk/ui/misc/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
Author: nbelaevski
Date: 2010-12-27 14:31:03 -0500 (Mon, 27 Dec 2010)
New Revision: 20816
Modified:
trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java
trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/jquery.component.js
Log:
https://issues.jboss.org/browse/RF-10099
Modified: trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java
===================================================================
--- trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java 2010-12-27
19:16:45 UTC (rev 20815)
+++ trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java 2010-12-27
19:31:03 UTC (rev 20816)
@@ -59,10 +59,10 @@
@Attribute
public abstract String getQuery();
- @Attribute(defaultValue = "JQueryAttachType.DEFAULT")
+ @Attribute
public abstract JQueryAttachType getAttachType();
- @Attribute(defaultValue = "JQueryTiming.DEFAULT")
+ @Attribute
public abstract JQueryTiming getTiming();
}
Modified:
trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/jquery.component.js
===================================================================
---
trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/jquery.component.js 2010-12-27
19:16:45 UTC (rev 20815)
+++
trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/jquery.component.js 2010-12-27
19:31:03 UTC (rev 20816)
@@ -60,10 +60,10 @@
};
var query = function(options) {
- if (options.timing == 'domready') {
+ if (options.timing == 'immediate') {
+ createQueryFunction(options).call(this);
+ } else {
jquery(document).ready(createQueryFunction(options));
- } else {
- createQueryFunction(options).call(this);
}
};