Title: [193085] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193085
- Author
- [email protected]
- Date
- 2015-12-03 10:45:03 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r188326. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193084 => 193085)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:44:58 UTC (rev 193084)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:45:03 UTC (rev 193085)
@@ -1,5 +1,20 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r188326. rdar://problem/23221163
+
+ 2015-08-11 Devin Rousso <[email protected]>
+
+ Web Inspector: Disabling attribute styles should not be possible
+ https://bugs.webkit.org/show_bug.cgi?id=147922
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection):
+ Increases the specificity of the if statement that adds rule disable state toggling to the icon.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r188325. rdar://problem/23221163
2015-08-11 Devin Rousso <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (193084 => 193085)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:44:58 UTC (rev 193084)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:45:03 UTC (rev 193085)
@@ -99,8 +99,7 @@
break;
}
- // Matches all situations except for User Agent styles.
- if (!(style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)) {
+ if (style.editable) {
this._iconElement.classList.add("toggle-able");
this._iconElement.title = WebInspector.UIString("Comment All Properties");
this._iconElement.addEventListener("click", this._toggleRuleOnOff.bind(this));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
