svn commit: r690745 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/util/string/JavascriptStripper.java test/java/org/apache/wicket/util/string/JavascriptStripperTest.java

[knopp]

Author: knopp
Date: Sun Aug 31 11:04:10 2008
New Revision: 690745

URL: http://svn.apache.org/viewvc?rev=690745&view=rev
Log:
WICKET-1806

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java?rev=690745&r1=690744&r2=690745&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
 Sun Aug 31 11:04:10 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/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java?rev=690745&r1=690744&r2=690745&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/string/JavascriptStripperTest.java
 Sun Aug 31 11:04:10 2008
@@ -70,4 +70,13 @@
                assertEquals(expected, after);
                System.out.println(after);
        }
+       
+       public void testWICKET1806()
+       {
+               String before = "a = [ /^(\\[) [EMAIL PROTECTED]([\\w-]+) 
*([!*$^~=]*) *('?\"?)(.*?)\\4 *\\]/ ];    b()";
+               String after = 
JavascriptStripper.stripCommentsAndWhitespace(before);
+               String expected = "a = [ /^(\\[) [EMAIL PROTECTED]([\\w-]+) 
*([!*$^~=]*) *('?\"?)(.*?)\\4 *\\]/ ];\nb()";
+               
+               assertEquals(expected, after);
+       }
 }