Title: [194940] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 194940
- Author
- [email protected]
- Date
- 2016-01-12 17:41:21 -0800 (Tue, 12 Jan 2016)
Log Message
Merge r194009. rdar://problem/24101259
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (194939 => 194940)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:18 UTC (rev 194939)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:21 UTC (rev 194940)
@@ -1,5 +1,23 @@
2016-01-12 Matthew Hanson <[email protected]>
+ Merge r194009. rdar://problem/24101259
+
+ 2015-12-12 Joseph Pecoraro <[email protected]>
+
+ REGRESSION (r191613): Web Inspector: Can't type spaces when editing DOM nodes
+ https://bugs.webkit.org/show_bug.cgi?id=152173
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel):
+ Disable the keyboard shortcuts when they are created. They will be
+ enabled when the panel is shown / hidden. It doesn't really make sense
+ that these are on the sidebar panel instead of the tab, but things
+ will be changing in Timelines soon anyways so just fix this now.
+
+2016-01-12 Matthew Hanson <[email protected]>
+
Merge r193858. rdar://problem/24101282
2015-12-09 Brian Burg <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (194939 => 194940)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2016-01-13 01:41:18 UTC (rev 194939)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2016-01-13 01:41:21 UTC (rev 194940)
@@ -177,9 +177,11 @@
this._toggleRecordingShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Space, this._toggleRecordingOnSpacebar.bind(this));
this._toggleRecordingShortcut.implicitlyPreventsDefault = false;
+ this._toggleRecordingShortcut.disabled = true;
this._toggleNewRecordingShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift, WebInspector.KeyboardShortcut.Key.Space, this._toggleNewRecordingOnSpacebar.bind(this));
this._toggleNewRecordingShortcut.implicitlyPreventsDefault = false;
+ this._toggleNewRecordingShortcut.disabled = true;
}
// Public
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
