Author: knopp
Date: Sun Aug 31 11:00:59 2008
New Revision: 690744
URL: http://svn.apache.org/viewvc?rev=690744&view=rev
Log:
WICKET-1806
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java?rev=690744&r1=690743&r2=690744&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
Sun Aug 31 11:00:59 2008
@@ -19,7 +19,7 @@
/**
* Strips comments and whitespace from javascript
- *
+ *
* @author Matej Knopp
*/
public class JavascriptStripper
@@ -68,7 +68,7 @@
/**
* Removes javascript comments and whitespace from specified string.
- *
+ *
* @param original
* Source string
* @return String with removed comments and whitespace
@@ -122,7 +122,8 @@
idx--;
continue;
}
- if (tmp == '=' || tmp == '(' ||
tmp == '{' || tmp == ':' || tmp == ',')
+ if (tmp == '=' || tmp == '(' ||
tmp == '{' || tmp == ':' || tmp == ',' ||
+ tmp == '[')
{
state = REG_EXP;
break;
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java?rev=690744&r1=690743&r2=690744&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
Sun Aug 31 11:00:59 2008
@@ -73,18 +73,9 @@
public void testWICKET1806()
{
- String before = "accepts: {\n" //
- + "xml: \"application/xml, text/xml\",\n" //
- + "html: \"text/html\",\n" + "script:
\"text/javascript, application/javascript\",\n" //
- + "json: \"application/json, text/javascript\",\n" +
"text: \"text/plain\",\n" //
- + "_default: \"*/*\"\n" + "} /* COMMENT THAT SHOULD BE
REMOVED! */"; //
+ String before = "a = [ /^(\\[) [EMAIL PROTECTED]([\\w-]+)
*([!*$^~=]*) *('?\"?)(.*?)\\4 *\\]/ ]; b()";
String after =
JavascriptStripper.stripCommentsAndWhitespace(before);
-
- String expected = "accepts: {\n" //
- + "xml: \"application/xml, text/xml\",\n" //
- + "html: \"text/html\",\n" + "script:
\"text/javascript, application/javascript\",\n" //
- + "json: \"application/json, text/javascript\",\n" +
"text: \"text/plain\",\n" //
- + "_default: \"*/*\"\n" + "} "; //
+ String expected = "a = [ /^(\\[) [EMAIL PROTECTED]([\\w-]+)
*([!*$^~=]*) *('?\"?)(.*?)\\4 *\\]/ ];\nb()";
assertEquals(expected, after);
}
