Title: [193092] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193092
- Author
- [email protected]
- Date
- 2015-12-03 10:45:57 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r188372. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193091 => 193092)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:45:52 UTC (rev 193091)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:45:57 UTC (rev 193092)
@@ -1,5 +1,23 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r188372. rdar://problem/23221163
+
+ 2015-08-12 Devin Rousso <[email protected]>
+
+ Web Inspector: Opening the Elements tab without a selected sidebar panel causes a crash
+ https://bugs.webkit.org/show_bug.cgi?id=147965
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/CSSStyleDetailsSidebarPanel.js:
+ (WebInspector.CSSStyleDetailsSidebarPanel):
+ If the saved setting for the selectedPanel does not exist, default to the rules panel.
+
+ (WebInspector.CSSStyleDetailsSidebarPanel.prototype._switchPanels):
+ Only save the new navigationItem info if the selectedPanel exists.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r188360. rdar://problem/23221163
2015-08-12 Matt Baker <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.js (193091 => 193092)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.js 2015-12-03 18:45:52 UTC (rev 193091)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.js 2015-12-03 18:45:57 UTC (rev 193092)
@@ -78,6 +78,9 @@
this._lastSelectedSectionSetting = new WebInspector.Setting("last-selected-style-details-panel", this._rulesStyleDetailsPanel.navigationInfo.identifier);
var selectedPanel = this._panelMatchingIdentifier(this._lastSelectedSectionSetting.value);
+ if (!selectedPanel)
+ selectedPanel = this._rulesStyleDetailsPanel;
+
this._switchPanels(selectedPanel);
this._navigationItem = new WebInspector.ScopeRadioButtonNavigationItem(this._identifier, this._displayName, this._panelNavigationInfo, selectedPanel.navigationInfo);
@@ -241,9 +244,9 @@
this.contentElement.classList.toggle("supports-new-rule", typeof this._selectedPanel.newRuleButtonClicked === "function");
this._selectedPanel.shown();
+
+ this._lastSelectedSectionSetting.value = selectedPanel.navigationInfo.identifier;
}
-
- this._lastSelectedSectionSetting.value = selectedPanel.navigationInfo.identifier;
}
_forcedPseudoClassCheckboxChanged(pseudoClass, event)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
