Title: [145045] trunk/Source/WebCore
- Revision
- 145045
- Author
- eus...@chromium.org
- Date
- 2013-03-07 00:08:58 -0800 (Thu, 07 Mar 2013)
Log Message
Web Inspector: Cmd+L (Go-to-Line) masks Go to location bar action
https://bugs.webkit.org/show_bug.cgi?id=111357
Reviewed by Pavel Feldman.
Allow panel shortcut handlers to bubble event.
* inspector/front-end/GoToLineDialog.js:
(WebInspector.GoToLineDialog.install): Minor refactoring, added JSDocs.
(WebInspector.GoToLineDialog._show): Added JSDocs and return value.
* inspector/front-end/Panel.js:
(WebInspector.Panel.prototype.handleShortcut):
Mark event as handled iff handler returned true.
* inspector/front-end/ScriptsPanel.js: Added return values to handlers.
* inspector/front-end/TimelinePanel.js: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145044 => 145045)
--- trunk/Source/WebCore/ChangeLog 2013-03-07 07:52:44 UTC (rev 145044)
+++ trunk/Source/WebCore/ChangeLog 2013-03-07 08:08:58 UTC (rev 145045)
@@ -1,3 +1,21 @@
+2013-03-07 Eugene Klyuchnikov <eus...@chromium.org>
+
+ Web Inspector: Cmd+L (Go-to-Line) masks Go to location bar action
+ https://bugs.webkit.org/show_bug.cgi?id=111357
+
+ Reviewed by Pavel Feldman.
+
+ Allow panel shortcut handlers to bubble event.
+
+ * inspector/front-end/GoToLineDialog.js:
+ (WebInspector.GoToLineDialog.install): Minor refactoring, added JSDocs.
+ (WebInspector.GoToLineDialog._show): Added JSDocs and return value.
+ * inspector/front-end/Panel.js:
+ (WebInspector.Panel.prototype.handleShortcut):
+ Mark event as handled iff handler returned true.
+ * inspector/front-end/ScriptsPanel.js: Added return values to handlers.
+ * inspector/front-end/TimelinePanel.js: Ditto.
+
2013-03-06 Takashi Sakamoto <ta...@google.com>
Box-shadow displayed improperly with border-radius.
Modified: trunk/Source/WebCore/inspector/front-end/GoToLineDialog.js (145044 => 145045)
--- trunk/Source/WebCore/inspector/front-end/GoToLineDialog.js 2013-03-07 07:52:44 UTC (rev 145044)
+++ trunk/Source/WebCore/inspector/front-end/GoToLineDialog.js 2013-03-07 08:08:58 UTC (rev 145045)
@@ -54,25 +54,25 @@
/**
* @param {WebInspector.Panel} panel
+ * @param {function():?WebInspector.View} viewGetter
*/
WebInspector.GoToLineDialog.install = function(panel, viewGetter)
{
- function showGoToLineDialog()
- {
- var view = viewGetter();
- if (view)
- WebInspector.GoToLineDialog._show(view);
- }
-
var goToLineShortcut = WebInspector.GoToLineDialog.createShortcut();
- panel.registerShortcuts([goToLineShortcut], showGoToLineDialog);
+ panel.registerShortcuts([goToLineShortcut], WebInspector.GoToLineDialog._show.bind(null, viewGetter));
}
-WebInspector.GoToLineDialog._show = function(sourceView)
+/**
+ * @param {function():?WebInspector.View} viewGetter
+ * @return {boolean}
+ */
+WebInspector.GoToLineDialog._show = function(viewGetter)
{
+ var sourceView = viewGetter();
if (!sourceView || !sourceView.canHighlightLine())
- return;
+ return false;
WebInspector.Dialog.show(sourceView.element, new WebInspector.GoToLineDialog(sourceView));
+ return true;
}
/**
Modified: trunk/Source/WebCore/inspector/front-end/Panel.js (145044 => 145045)
--- trunk/Source/WebCore/inspector/front-end/Panel.js 2013-03-07 07:52:44 UTC (rev 145044)
+++ trunk/Source/WebCore/inspector/front-end/Panel.js 2013-03-07 08:08:58 UTC (rev 145045)
@@ -251,15 +251,13 @@
{
var shortcutKey = WebInspector.KeyboardShortcut.makeKeyFromEvent(event);
var handler = this._shortcuts[shortcutKey];
- if (handler) {
- handler(event);
+ if (handler && handler(event))
event.handled = true;
- }
},
/**
* @param {!Array.<!WebInspector.KeyboardShortcut.Descriptor>} keys
- * @param {function(KeyboardEvent)} handler
+ * @param {function(KeyboardEvent):boolean} handler
*/
registerShortcuts: function(keys, handler)
{
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (145044 => 145045)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2013-03-07 07:52:44 UTC (rev 145044)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2013-03-07 08:08:58 UTC (rev 145045)
@@ -751,8 +751,10 @@
_evaluateSelectionInConsole: function()
{
var selection = window.getSelection();
- if (selection.type === "Range" && !selection.isCollapsed)
- WebInspector.evaluateInConsole(selection.toString());
+ if (selection.type !== "Range" || selection.isCollapsed)
+ return false;
+ WebInspector.evaluateInConsole(selection.toString());
+ return true;
},
_createDebugToolbar: function()
@@ -957,29 +959,32 @@
{
var sourceFrame = this.visibleView;
if (!sourceFrame)
- return;
+ return false;
if (sourceFrame instanceof WebInspector._javascript_SourceFrame) {
var _javascript_SourceFrame = /** @type {WebInspector._javascript_SourceFrame} */ (sourceFrame);
_javascript_SourceFrame.toggleBreakpointOnCurrentLine();
- }
+ return true;
+ }
+ return false;
},
_showOutlineDialog: function()
{
var uiSourceCode = this._editorContainer.currentFile();
if (!uiSourceCode)
- return;
+ return false;
switch (uiSourceCode.contentType()) {
case WebInspector.resourceTypes.Document:
case WebInspector.resourceTypes.Script:
WebInspector._javascript_OutlineDialog.show(this.visibleView, uiSourceCode);
- break;
+ return true;
case WebInspector.resourceTypes.Stylesheet:
WebInspector.StyleSheetOutlineDialog.show(this.visibleView, uiSourceCode);
- break;
+ return true;
}
+ return false;
},
_installDebuggerSidebarController: function()
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (145044 => 145045)
--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2013-03-07 07:52:44 UTC (rev 145044)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2013-03-07 08:08:58 UTC (rev 145045)
@@ -373,8 +373,9 @@
_saveToFile: function()
{
if (this._operationInProgress)
- return;
+ return false;
this._model.saveToFile();
+ return true;
},
_loadFromFile: function()
@@ -564,17 +565,17 @@
_toggleTimelineButtonClicked: function()
{
if (this._operationInProgress)
- return;
+ return false;
if (this.toggleTimelineButton.toggled) {
this._model.stopRecord();
this.toggleTimelineButton.title = WebInspector.UIString("Record");
- }
- else {
+ } else {
this._model.startRecord();
this.toggleTimelineButton.title = WebInspector.UIString("Stop");
WebInspector.userMetrics.TimelineStarted.record();
}
this.toggleTimelineButton.toggled = !this.toggleTimelineButton.toggled;
+ return true;
},
_durationFilterChanged: function()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
