Diff
Modified: trunk/Source/WebCore/ChangeLog (123493 => 123494)
--- trunk/Source/WebCore/ChangeLog 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/ChangeLog 2012-07-24 18:05:14 UTC (rev 123494)
@@ -1,3 +1,33 @@
+2012-07-24 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Snippets UI polish
+ https://bugs.webkit.org/show_bug.cgi?id=92142
+
+ Reviewed by Pavel Feldman.
+
+ Changed snippets context menu items.
+ Added run snippet status bar button.
+ Removed unused edit source button.
+
+ * English.lproj/localizedStrings.js:
+ * inspector/front-end/Images/statusbarButtonGlyphs.png:
+ * inspector/front-end/ScriptSnippetModel.js:
+ (WebInspector.SnippetJavaScriptSourceFrame):
+ (WebInspector.SnippetJavaScriptSourceFrame.prototype.statusBarItems):
+ (WebInspector.SnippetJavaScriptSourceFrame.prototype._runButtonClicked):
+ * inspector/front-end/ScriptsNavigator.js:
+ (WebInspector.SnippetsNavigatorView.prototype.getOrCreateFolderTreeElement):
+ (WebInspector.SnippetsNavigatorView.prototype.handleContextMenu):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._updateScriptViewStatusBarItems):
+ (WebInspector.ScriptsPanel.prototype._createSourceFrame):
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype.statusBarItems):
+ * inspector/front-end/inspector.css:
+ * inspector/front-end/scriptsPanel.css:
+ (.evaluate-snippet-status-bar-item .glyph):
+ (.evaluate-snippet-status-bar-item.toggled .glyph):
+
2012-07-24 Nico Weber <[email protected]>
[chromium/mac] Remove webcore_resource_files from WebCore.gypi
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js (123493 => 123494)
--- trunk/Source/WebCore/English.lproj/localizedStrings.js 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/English.lproj/localizedStrings.js 2012-07-24 18:05:14 UTC (rev 123494)
@@ -674,14 +674,10 @@
localizedStrings["Show each event as a vertical bar in overview"] = "Show each event as a vertical bar in overview";
localizedStrings["Evaluated snippets"] = "Evaluated snippets";
localizedStrings["An error happend when a call for method '%s' was requested"] = "An error happened when a call for method '%s' was requested";
-localizedStrings["Evaluate snippet"] = "Evaluate snippet";
-localizedStrings["Evaluate Snippet"] = "Evaluate Snippet";
-localizedStrings["Rename snippet"] = "Rename snippet";
-localizedStrings["Rename Snippet"] = "Rename Snippet";
-localizedStrings["Remove snippet"] = "Remove snippet";
-localizedStrings["Remove Snippet"] = "Remove Snippet";
-localizedStrings["Create snippet"] = "Create snippet";
-localizedStrings["Create Snippet"] = "Create Snippet";
+localizedStrings["Run"] = "Run";
+localizedStrings["Rename"] = "Rename";
+localizedStrings["Remove"] = "Remove";
+localizedStrings["New"] = "New";
localizedStrings["Frame"] = "Frame";
localizedStrings["FPS"] = "FPS";
localizedStrings["Continuation Frame"] = "Continuation Frame";
Modified: trunk/Source/WebCore/inspector/front-end/Images/statusbarButtonGlyphs.png
(Binary files differ)
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (123493 => 123494)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-24 18:05:14 UTC (rev 123494)
@@ -548,3 +548,35 @@
* @type {?WebInspector.ScriptSnippetModel}
*/
WebInspector.scriptSnippetModel = null;
+
+/**
+ * @constructor
+ * @extends {WebInspector.SourceFrame}
+ * @param {WebInspector.ScriptsPanel} scriptsPanel
+ * @param {WebInspector.SnippetJavaScriptSource} snippetJavaScriptSource
+ */
+WebInspector.SnippetJavaScriptSourceFrame = function(scriptsPanel, snippetJavaScriptSource)
+{
+ WebInspector._javascript_SourceFrame.call(this, scriptsPanel, snippetJavaScriptSource);
+
+ this._snippetJavaScriptSource = snippetJavaScriptSource;
+ this._runButton = new WebInspector.StatusBarButton(WebInspector.UIString("Run"), "evaluate-snippet-status-bar-item");
+ this._runButton.addEventListener("click", this._runButtonClicked, this);
+}
+
+WebInspector.SnippetJavaScriptSourceFrame.prototype = {
+ /**
+ * @return {Array.<Element>}
+ */
+ statusBarItems: function()
+ {
+ return [this._runButton.element];
+ },
+
+ _runButtonClicked: function()
+ {
+ this._snippetJavaScriptSource.evaluate();
+ }
+}
+
+WebInspector.SnippetJavaScriptSourceFrame.prototype.__proto__ = WebInspector._javascript_SourceFrame.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js (123493 => 123494)
--- trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-07-24 18:05:14 UTC (rev 123494)
@@ -212,22 +212,9 @@
*/
getOrCreateFolderTreeElement: function(uiSourceCode)
{
- if (uiSourceCode.isSnippet)
- return this._scriptsTree;
- if (uiSourceCode.isSnippetEvaluation)
- return this._getOrCreateSnippetEvaluationsFolderTreeElement();
- return WebInspector.NavigatorView.prototype.getOrCreateFolderTreeElement.call(this, uiSourceCode);
+ return this._scriptsTree;
},
- _getOrCreateSnippetEvaluationsFolderTreeElement: function()
- {
- const snippetEvaluationsFolderIdentifier = "snippetEvaluationsFolder";
- var folderTreeElement = this._folderTreeElements[snippetEvaluationsFolderIdentifier];
- if (folderTreeElement)
- return folderTreeElement;
- return this.createFolderTreeElement(this._scriptsTree, snippetEvaluationsFolderIdentifier, "", WebInspector.UIString("Evaluated snippets"));
- },
-
/**
* @param {Event} event
* @param {WebInspector.UISourceCode=} uiSourceCode
@@ -236,12 +223,12 @@
{
var contextMenu = new WebInspector.ContextMenu();
if (uiSourceCode) {
- contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Evaluate snippet" : "Evaluate Snippet"), this._handleEvaluateSnippet.bind(this, uiSourceCode));
- contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Rename snippet" : "Rename Snippet"), this._handleRenameSnippet.bind(this, uiSourceCode));
- contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Remove snippet" : "Remove Snippet"), this._handleRemoveSnippet.bind(this, uiSourceCode));
+ contextMenu.appendItem(WebInspector.UIString("Run"), this._handleEvaluateSnippet.bind(this, uiSourceCode));
+ contextMenu.appendItem(WebInspector.UIString("Rename"), this._handleRenameSnippet.bind(this, uiSourceCode));
+ contextMenu.appendItem(WebInspector.UIString("Remove"), this._handleRemoveSnippet.bind(this, uiSourceCode));
contextMenu.appendSeparator();
}
- contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Create snippet" : "Create Snippet"), this._handleCreateSnippet.bind(this));
+ contextMenu.appendItem(WebInspector.UIString("New"), this._handleCreateSnippet.bind(this));
contextMenu.show(event);
},
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (123493 => 123494)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-07-24 18:05:14 UTC (rev 123494)
@@ -382,7 +382,7 @@
var sourceFrame = this.visibleView;
if (sourceFrame) {
- var statusBarItems = sourceFrame.statusBarItems || [];
+ var statusBarItems = sourceFrame.statusBarItems() || [];
for (var i = 0; i < statusBarItems.length; ++i)
this._scriptViewStatusBarItemsContainer.appendChild(statusBarItems[i]);
}
@@ -461,9 +461,12 @@
_createSourceFrame: function(uiSourceCode)
{
var sourceFrame;
- if (uiSourceCode instanceof WebInspector._javascript_Source) {
- var _javascript_Source = /** @type {WebInspector._javascript_Source} */ uiSourceCode;
- sourceFrame = new WebInspector._javascript_SourceFrame(this, _javascript_Source);
+ if (uiSourceCode instanceof WebInspector.SnippetJavaScriptSource) {
+ var snippetJavaScriptSource = /** @type {WebInspector.SnippetJavaScriptSource} */ uiSourceCode;
+ sourceFrame = new WebInspector.SnippetJavaScriptSourceFrame(this, snippetJavaScriptSource);
+ } else if (uiSourceCode instanceof WebInspector._javascript_Source) {
+ var _javascript_Source = /** @type {WebInspector._javascript_Source} */ uiSourceCode;
+ sourceFrame = new WebInspector._javascript_SourceFrame(this, _javascript_Source);
} else
sourceFrame = new WebInspector.UISourceCodeFrame(uiSourceCode);
Modified: trunk/Source/WebCore/inspector/front-end/SourceFrame.js (123493 => 123494)
--- trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2012-07-24 18:05:14 UTC (rev 123494)
@@ -103,6 +103,14 @@
this._clearLineToReveal();
},
+ /**
+ * @return {Array.<Element>}
+ */
+ statusBarItems: function()
+ {
+ return [];
+ },
+
defaultFocusedElement: function()
{
return this._textEditor.defaultFocusedElement();
Modified: trunk/Source/WebCore/inspector/front-end/inspector.css (123493 => 123494)
--- trunk/Source/WebCore/inspector/front-end/inspector.css 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/inspector/front-end/inspector.css 2012-07-24 18:05:14 UTC (rev 123494)
@@ -1853,14 +1853,6 @@
-webkit-mask-position: -96px -24px;
}
-button.edit-source-status-bar-item .glyph {
- -webkit-mask-position: -64px -48px;
-}
-
-button.edit-source-status-bar-item.toggled-on .glyph {
- background-color: rgb(66, 129, 235);
-}
-
#console-messages.console-filter-top {
margin-top: 23px;
}
Modified: trunk/Source/WebCore/inspector/front-end/scriptsPanel.css (123493 => 123494)
--- trunk/Source/WebCore/inspector/front-end/scriptsPanel.css 2012-07-24 17:47:48 UTC (rev 123493)
+++ trunk/Source/WebCore/inspector/front-end/scriptsPanel.css 2012-07-24 18:05:14 UTC (rev 123494)
@@ -47,6 +47,14 @@
background-color: rgb(66, 129, 235);
}
+.evaluate-snippet-status-bar-item .glyph {
+ -webkit-mask-position: -64px -48px;
+}
+
+.evaluate-snippet-status-bar-item.toggled .glyph {
+ background-color: rgb(66, 129, 235);
+}
+
#scripts-debug-toolbar {
position: relative;
margin-top: -1px;
