Changeset 188730 in webkit

Timestamp:

Aug 20, 2015 6:37:40 PM (9 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Visual editor adds extra spaces to styles with no properties
​https://bugs.webkit.org/show_bug.cgi?id=148242

Reviewed by Timothy Hatcher.

• UserInterface/Models/CSSStyleDeclaration.js:

(WebInspector.CSSStyleDeclaration.prototype.set text):
Now trims the text and, if the resulting string has no length or the style is inline,
replaces the text to be set with the trimmed text.

• UserInterface/Views/VisualStylePropertyCombiner.js:

(WebInspector.VisualStylePropertyCombiner.prototype.modifyPropertyText):
Removed unnecessary trim.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/CSSStyleDeclaration.js (modified) (1 diff)
• UserInterface/Views/VisualStylePropertyCombiner.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-08-20  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Visual editor adds extra spaces to styles with no properties
+        https://bugs.webkit.org/show_bug.cgi?id=148242
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Models/CSSStyleDeclaration.js:
+        (WebInspector.CSSStyleDeclaration.prototype.set text):
+        Now trims the text and, if the resulting string has no length or the style is inline,
+        replaces the text to be set with the trimmed text.
+
+        * UserInterface/Views/VisualStylePropertyCombiner.js:
+        (WebInspector.VisualStylePropertyCombiner.prototype.modifyPropertyText):
+        Removed unnecessary trim.
+
 2015-08-20  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js

@@ -187 +187 @@
             return;
 
-        var modified = text !== this._initialText;
+        let trimmedText = text.trim();
+        if (this._text === trimmedText)
+            return;
+
+        if (!trimmedText.length || this._type === WebInspector.CSSStyleDeclaration.Type.Inline)
+            text = trimmedText;
+
+        let modified = text !== this._initialText;
         if (modified !== this._hasModifiedInitialText) {
             this._hasModifiedInitialText = modified;

trunk/Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyCombiner.js

@@ -78 +78 @@
     modifyPropertyText(text, value)
     {
-        let trimmedText = text.trimRight();
         if (this._textContainsNameRegExp.test(text))
             text = text.replace(this._replacementRegExp, value !== null ? "$1$2: " + value + ";" : "$1");