Author: nbelaevski
Date: 2010-12-27 18:26:18 -0500 (Mon, 27 Dec 2010)
New Revision: 20819
Modified:
trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java
trunk/core/api/src/test/java/org/ajax4jsf/javascript/ScriptUtilsTest.java
trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js
Log:
https://issues.jboss.org/browse/RF-10092
Modified: trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java
===================================================================
--- trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2010-12-27
20:30:58 UTC (rev 20818)
+++ trunk/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2010-12-27
23:26:18 UTC (rev 20819)
@@ -154,6 +154,8 @@
// all other put as encoded strings.
appendEncodedString(appendable, obj);
+ } else if (obj instanceof Character) {
+ appendEncodedString(appendable, obj);
} else if (obj instanceof Enum<?>) {
// all other put as encoded strings.
Modified: trunk/core/api/src/test/java/org/ajax4jsf/javascript/ScriptUtilsTest.java
===================================================================
--- trunk/core/api/src/test/java/org/ajax4jsf/javascript/ScriptUtilsTest.java 2010-12-27
20:30:58 UTC (rev 20818)
+++ trunk/core/api/src/test/java/org/ajax4jsf/javascript/ScriptUtilsTest.java 2010-12-27
23:26:18 UTC (rev 20819)
@@ -287,6 +287,10 @@
assertEquals("\"TestEnum: B\"",
ScriptUtils.toScript(TestEnum.B));
}
+ public void testCharacter() throws Exception {
+ assertEquals("\"N\"", ScriptUtils.toScript('N'));
+ }
+
private void assertCaptureEquals(Capture<? extends Object> capture, String
expected) {
StringBuilder sb = new StringBuilder();
List<? extends Object> list = capture.getValues();
Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-12-27 20:30:58
UTC (rev 20818)
+++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-12-27 23:26:18
UTC (rev 20819)
@@ -288,9 +288,9 @@
//
var pollTracker = {};
- richfaces.startPoll = function(options) {
+ richfaces.startPoll = function(options) {
var pollId = options.pollId;
- var interval = options.pollinterval;
+ var interval = options.interval || 1000;
var ontimer = options.ontimer;
richfaces.stopPoll(pollId);