Changeset 202589 in webkit

Timestamp:

Jun 28, 2016 2:33:10 PM (8 years ago)

Author:

Nikita Vasilyev

Message:

REGRESSION (r188730): Web Inspector: Warning icons incorrectly positioned in CSS Rules sidebar
​https://bugs.webkit.org/show_bug.cgi?id=157869
<rdar://problem/26356520>

Reviewed by Timothy Hatcher.

Before r188730, CSS text always had a line break as a prefix. r188730 started trimming text.
This patch keeps trimming unnecessary whitespace but brings back required line break prefix.

• UserInterface/Models/CSSStyleDeclaration.js:

(WebInspector.CSSStyleDeclaration.prototype.set text):

• UserInterface/Views/CSSStyleDeclarationTextEditor.js:

Make PrefixWhitespace and SuffixWhitespace public.

(WebInspector.CSSStyleDeclarationTextEditor.prototype._formattedContent):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers.update):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers):
Remove an if conditional as it's always true.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/CSSStyleDeclaration.js (modified) (1 diff)
• UserInterface/Views/CSSStyleDeclarationTextEditor.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-06-28  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        REGRESSION (r188730): Web Inspector: Warning icons incorrectly positioned in CSS Rules sidebar
+        https://bugs.webkit.org/show_bug.cgi?id=157869
+        <rdar://problem/26356520>
+
+        Reviewed by Timothy Hatcher.
+
+        Before r188730, CSS text always had a line break as a prefix. r188730 started trimming text.
+        This patch keeps trimming unnecessary whitespace but brings back required line break prefix.
+
+        * UserInterface/Models/CSSStyleDeclaration.js:
+        (WebInspector.CSSStyleDeclaration.prototype.set text):
+        * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+        Make PrefixWhitespace and SuffixWhitespace public.
+
+        (WebInspector.CSSStyleDeclarationTextEditor.prototype._formattedContent):
+        (WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers.update):
+        (WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers):
+        Remove an if conditional as it's always true.
+
 2016-06-28  Brian Burg  <bburg@apple.com>
 

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

@@ -187 +187 @@
             return;
 
-        let trimmedText = text.trim();
+        let trimmedText = WebInspector.CSSStyleDeclarationTextEditor.PrefixWhitespace + text.trim();
         if (this._text === trimmedText)
             return;
 
-        if (!trimmedText.length || this._type === WebInspector.CSSStyleDeclaration.Type.Inline)
+        if (trimmedText === WebInspector.CSSStyleDeclarationTextEditor.PrefixWhitespace || this._type === WebInspector.CSSStyleDeclaration.Type.Inline)
             text = trimmedText;
 

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

@@ -43 +43 @@
         this._sortProperties = false;
 
-        this._prefixWhitespace = "\n";
-        this._suffixWhitespace = "\n";
         this._linePrefixWhitespace = "";
 
@@ -696 +694 @@
     {
         // Start with the prefix whitespace we stripped.
-        var content = this._prefixWhitespace;
+        var content = WebInspector.CSSStyleDeclarationTextEditor.PrefixWhitespace;
 
         // Get each line and add the line prefix whitespace and newlines.
@@ -708 +706 @@
 
         // Add the suffix whitespace we stripped.
-        content += this._suffixWhitespace;
+        content += WebInspector.CSSStyleDeclarationTextEditor.SuffixWhitespace;
 
         // This regular expression replacement removes extra newlines
@@ -790 +788 @@
 
                 // Adjust the line position for the missing prefix line.
-                if (this._prefixWhitespace) {
-                    --from.line;
-                    --to.line;
-                }
+                from.line--;
+                to.line--;
 
                 // Adjust the column for the stripped line prefix whitespace.
@@ -1667 +1663 @@
 };
 
+WebInspector.CSSStyleDeclarationTextEditor.PrefixWhitespace = "\n";
+WebInspector.CSSStyleDeclarationTextEditor.SuffixWhitespace = "\n";
 WebInspector.CSSStyleDeclarationTextEditor.StyleClassName = "css-style-text-editor";
 WebInspector.CSSStyleDeclarationTextEditor.ReadOnlyStyleClassName = "read-only";