[richfaces-svn-commits] JBoss Rich Faces SVN: r4879 - in branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf: org/w3c/tidy and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: alexsmirnov
Date: 2007-12-17 18:00:30 -0500 (Mon, 17 Dec 2007)
New Revision: 4879

Modified:
   branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java
   branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Node.java
Log:
fix issues http://jira.jboss.com/jira/browse/RF-1603 and http://jira.jboss.com/jira/browse/RF-1012

Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java	2007-12-17 22:48:55 UTC (rev 4878)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java	2007-12-17 23:00:30 UTC (rev 4879)
@@ -67,8 +67,9 @@
 					.getInstance();
 			ParserState state = stateManager.getInitialState();
 			ParsingContext context = new ParsingContext(out);
-			char c;
-			while ((c = (char) in.read()) > 0) {
+			int nextChar;
+			while ((nextChar = in.read()) > 0) {
+				char c = (char)nextChar;
 				state = state.getNextState(c, context);
 				if (log.isDebugEnabled()) {
 					// Find state name.

Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Node.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Node.java	2007-12-17 22:48:55 UTC (rev 4878)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/org/w3c/tidy/Node.java	2007-12-17 23:00:30 UTC (rev 4879)
@@ -1554,7 +1554,7 @@
         for (attr = this.attributes; attr != null; attr = attr.next)
         {
             if (("language".equalsIgnoreCase(attr.attribute) || "type".equalsIgnoreCase(attr.attribute))
-                && "javascript".equalsIgnoreCase(attr.value))
+                && ("javascript".equalsIgnoreCase(attr.value)||"text/javascript".equalsIgnoreCase(attr.value)))
             {
                 result = true;
             }