Changeset 27981 in webkit

Timestamp:

Nov 22, 2007 8:45:26 PM (16 years ago)

Author:

timothy@apple.com

Message:

Reviewed by Dan Bernstein.

Fix the Element.hasStyleClass and Element.removeStyleClass helpers
to not find and replace substrings, but whole class names at the
beginning or end of the string or surrounded by whitespace.

• page/inspector/utilities.js:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/utilities.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-22  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Fix the Element.hasStyleClass and Element.removeStyleClass helpers
+        to not find and replace substrings, but whole class names at the
+        beginning or end of the string or surrounded by whitespace.
+
+        * page/inspector/utilities.js:
+
 2007-11-22  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/page/inspector/utilities.js

@@ -90 +90 @@
 Element.prototype.removeStyleClass = function(className) 
 {
-    if (this.hasStyleClass(className))
-        this.className = this.className.replace(className, "");
+    // Test for the simple case before using a RegExp.
+    if (this.className === className) {
+        this.className = "";
+        return;
+    }
+
+    var regex = new RegExp("(^|\\s+)" + className.escapeForRegExp() + "($|\\s+)");
+    if (regex.test(this.className))
+        this.className = this.className.replace(regex, " ");
 }
 
 Element.prototype.addStyleClass = function(className) 
 {
-    if (!this.hasStyleClass(className))
+    if (className && !this.hasStyleClass(className))
         this.className += (this.className.length ? " " + className : className);
 }
@@ -102 +109 @@
 Element.prototype.hasStyleClass = function(className) 
 {
-    return this.className.indexOf(className) !== -1;
+    if (!className)
+        return false;
+    // Test for the simple case before using a RegExp.
+    if (this.className === className)
+        return true;
+    var regex = new RegExp("(^|\\s)" + className.escapeForRegExp() + "($|\\s)");
+    return regex.test(this.className);
 }