Title: [106237] trunk
- Revision
- 106237
- Author
- [email protected]
- Date
- 2012-01-30 05:04:28 -0800 (Mon, 30 Jan 2012)
Log Message
Web Inspector: [Styles] Unable to paste and subsequently edit multiple properties in the Styles pane
https://bugs.webkit.org/show_bug.cgi?id=77209
Reviewed by Pavel Feldman.
Source/WebCore:
Check if the property value contains a ";" before kicking the freeflow text update.
* inspector/front-end/StylesSidebarPane.js:
(WebInspector.StylePropertyTreeElement.prototype):
LayoutTests:
* inspector/styles/styles-add-blank-property-expected.txt:
* inspector/styles/styles-add-blank-property.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (106236 => 106237)
--- trunk/LayoutTests/ChangeLog 2012-01-30 13:02:57 UTC (rev 106236)
+++ trunk/LayoutTests/ChangeLog 2012-01-30 13:04:28 UTC (rev 106237)
@@ -1,3 +1,13 @@
+2012-01-30 Alexander Pavlov <[email protected]>
+
+ Web Inspector: [Styles] Unable to paste and subsequently edit multiple properties in the Styles pane
+ https://bugs.webkit.org/show_bug.cgi?id=77209
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/styles/styles-add-blank-property-expected.txt:
+ * inspector/styles/styles-add-blank-property.html:
+
2012-01-30 Yuzo Fujishima <[email protected]>
[Chromium] Unreviewed test expectation change.
Modified: trunk/LayoutTests/inspector/styles/styles-add-blank-property-expected.txt (106236 => 106237)
--- trunk/LayoutTests/inspector/styles/styles-add-blank-property-expected.txt 2012-01-30 13:02:57 UTC (rev 106236)
+++ trunk/LayoutTests/inspector/styles/styles-add-blank-property-expected.txt 2012-01-30 13:04:28 UTC (rev 106237)
@@ -24,4 +24,18 @@
display: block;
+After append and change of a 'compound' property:
+[expanded]
+element.style { ()
+font-size: 12px;
+margin-left: 3px;
+color: red;
+font-weight: bold;
+======== Matched CSS Rules ========
+[expanded]
+div { (user agent stylesheet)
+display: block;
+
+
+
Modified: trunk/LayoutTests/inspector/styles/styles-add-blank-property.html (106236 => 106237)
--- trunk/LayoutTests/inspector/styles/styles-add-blank-property.html 2012-01-30 13:02:57 UTC (rev 106236)
+++ trunk/LayoutTests/inspector/styles/styles-add-blank-property.html 2012-01-30 13:04:28 UTC (rev 106237)
@@ -55,6 +55,38 @@
{
InspectorTest.addResult("After append:");
InspectorTest.dumpSelectedElementStyles(true);
+
+ treeElement = WebInspector.panels.elements.sidebarPanes.styles.sections[0][1].addNewBlankProperty();
+ treeElement.startEditing();
+ treeElement.nameElement.textContent = "color";
+ treeElement.nameElement.dispatchEvent(InspectorTest.createKeyEvent("Enter"));
+
+ treeElement.valueElement.textContent = "green; font-weight: bold";
+ treeElement.kickFreeFlowStyleEditForTest();
+
+ treeElement.valueElement.textContent = "red; font-weight: bold";
+ treeElement.kickFreeFlowStyleEditForTest();
+
+ treeElement.valueElement.dispatchEvent(InspectorTest.createKeyEvent("Enter"));
+ InspectorTest.runAfterPendingDispatches(step6);
+ }
+
+ function step6()
+ {
+ InspectorTest.selectNodeWithId("other");
+ InspectorTest.runAfterPendingDispatches(step7);
+ }
+
+ function step7()
+ {
+ InspectorTest.selectNodeAndWaitForStyles("inspected", step8);
+ }
+
+
+ function step8()
+ {
+ InspectorTest.addResult("After append and change of a 'compound' property:");
+ InspectorTest.dumpSelectedElementStyles(true);
InspectorTest.completeTest();
}
}
Modified: trunk/Source/WebCore/ChangeLog (106236 => 106237)
--- trunk/Source/WebCore/ChangeLog 2012-01-30 13:02:57 UTC (rev 106236)
+++ trunk/Source/WebCore/ChangeLog 2012-01-30 13:04:28 UTC (rev 106237)
@@ -1,3 +1,15 @@
+2012-01-30 Alexander Pavlov <[email protected]>
+
+ Web Inspector: [Styles] Unable to paste and subsequently edit multiple properties in the Styles pane
+ https://bugs.webkit.org/show_bug.cgi?id=77209
+
+ Reviewed by Pavel Feldman.
+
+ Check if the property value contains a ";" before kicking the freeflow text update.
+
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylePropertyTreeElement.prototype):
+
2012-01-30 Vsevolod Vlasov <[email protected]>
Web Inspector: Change Open Resource and Go To function shortcuts in scripts panel.
Modified: trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js (106236 => 106237)
--- trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-01-30 13:02:57 UTC (rev 106236)
+++ trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-01-30 13:04:28 UTC (rev 106237)
@@ -1987,7 +1987,9 @@
function apply()
{
- this.applyStyleText(this.nameElement.textContent + ": " + this.valueElement.textContent, false, false, false);
+ var valueText = this.valueElement.textContent;
+ if (valueText.indexOf(";") === -1)
+ this.applyStyleText(this.nameElement.textContent + ": " + valueText, false, false, false);
}
if (now)
apply.call(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
