Changeset 185789 in webkit

Timestamp:

Jun 19, 2015, 11:20:21 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Duplication of style attribute in rules panel for shadow content
​https://bugs.webkit.org/show_bug.cgi?id=146176

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-06-19
Reviewed by Timothy Hatcher.

• UserInterface/Views/CSSStyleDeclarationTextEditor.js:

The styleText can be non-empty for a readonly editor if the editor is for
the style attribute of a shadow dom node. Instead of assuming it is empty
we can just clear the editor ourselves and regenerate from properties.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CSSStyleDeclarationTextEditor.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-06-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Duplication of style attribute in rules panel for shadow content
+        https://bugs.webkit.org/show_bug.cgi?id=146176
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+        The styleText can be non-empty for a readonly editor if the editor is for
+        the style attribute of a shadow dom node. Instead of assuming it is empty
+        we can just clear the editor ourselves and regenerate from properties.
+
 2015-06-19  Devin Rousso  <drousso@apple.com>
 

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

@@ -1053 +1053 @@
             var findWhitespace = /\s+/g;
 
-            // Only format non-empty styles. Keep in mind that styleText is always empty
-            // for "readOnly" Editors. But prepare Checkbox placeholders in any case.
-            // Because that will indent the cursor when the User starts typing.
+            // We only need to format non-empty styles, but prepare checkbox placeholders
+            // in any case because that will indent the cursor when the User starts typing.
             if (!styleText && !isEditorReadOnly) {
                 this._markLinesWithCheckboxPlaceholder();
@@ -1061 +1060 @@
             }
 
-            // Set non-optimized, valid and invalid styles in preparation for the Formatter.
-            // Set empty string in case of readonly styles.
-            this._codeMirror.setValue(styleText);
-
+            // Generate formatted content for readonly editors by iterating properties.
             if (isEditorReadOnly) {
+                this._codeMirror.setValue("");
                 var lineNumber = 0;
                 this._iterateOverProperties(false, function(property) {
@@ -1075 +1072 @@
                     lineNumber++;
                 });
-
                 return;
             }
+
+            // Set non-optimized, valid and invalid styles in preparation for the Formatter.
+            this._codeMirror.setValue(styleText);
 
             // Now the Formatter pretty prints the styles.