Changeset 92674 in webkit

Timestamp:

Aug 9, 2011 3:39:27 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Add "Refresh" to context menu of resources panel cookies view.
​https://bugs.webkit.org/show_bug.cgi?id=65854

Reviewed by Pavel Feldman.

• inspector/front-end/CookieItemsView.js:

(WebInspector.CookieItemsView):
(WebInspector.CookieItemsView.prototype._updateWithCookies):
(WebInspector.CookieItemsView.prototype._refreshButtonClicked):
(WebInspector.CookieItemsView.prototype._contextMenu):

• inspector/front-end/CookiesTable.js:

(WebInspector.CookiesTable):

• inspector/front-end/DataGrid.js:

(WebInspector.DataGrid.prototype.get refreshCallback):
(WebInspector.DataGrid.prototype.set refreshCallback):
(WebInspector.DataGrid.prototype._contextMenuInDataTable):

• inspector/front-end/ResourceCookiesView.js:

(WebInspector.ResourceCookiesView.prototype._buildCookiesTable):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/CookieItemsView.js (modified) (3 diffs)
• inspector/front-end/CookiesTable.js (modified) (2 diffs)
• inspector/front-end/DataGrid.js (modified) (2 diffs)
• inspector/front-end/ResourceCookiesView.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-09  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Add "Refresh" to context menu of resources panel cookies view.
+        https://bugs.webkit.org/show_bug.cgi?id=65854
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/CookieItemsView.js:
+        (WebInspector.CookieItemsView):
+        (WebInspector.CookieItemsView.prototype._updateWithCookies):
+        (WebInspector.CookieItemsView.prototype._refreshButtonClicked):
+        (WebInspector.CookieItemsView.prototype._contextMenu):
+        * inspector/front-end/CookiesTable.js:
+        (WebInspector.CookiesTable):
+        * inspector/front-end/DataGrid.js:
+        (WebInspector.DataGrid.prototype.get refreshCallback):
+        (WebInspector.DataGrid.prototype.set refreshCallback):
+        (WebInspector.DataGrid.prototype._contextMenuInDataTable):
+        * inspector/front-end/ResourceCookiesView.js:
+        (WebInspector.ResourceCookiesView.prototype._buildCookiesTable):
+
 2011-08-09  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/CookieItemsView.js

@@ -46 +46 @@
     this._emptyView = new WebInspector.EmptyView(WebInspector.UIString("This site has no cookies."));
     this._emptyView.show(this.element);
+    
+    this.element.addEventListener("contextmenu", this._contextMenu.bind(this), true);
 }
 
@@ -91 +93 @@
 
         if (!this._cookiesTable) {
-            this._cookiesTable = isAdvanced ? new WebInspector.CookiesTable(this._cookieDomain, false, this._deleteCookie.bind(this)) : new WebInspector.SimpleCookiesTable();
+            this._cookiesTable = isAdvanced ? new WebInspector.CookiesTable(this._cookieDomain, false, this._deleteCookie.bind(this), this._update.bind(this)) : new WebInspector.SimpleCookiesTable();
             this.element.appendChild(this._cookiesTable.element);
         }
@@ -152 +154 @@
     {
         this._update();
+    },
+    
+    _contextMenu: function()
+    {
+        if (!this._cookies.length) {
+            var contextMenu = new WebInspector.ContextMenu();
+            contextMenu.appendItem(WebInspector.UIString("Refresh"), this._update.bind(this));
+            contextMenu.show(event);
+        }
     }
 }

trunk/Source/WebCore/inspector/front-end/CookiesTable.js

@@ -29 +29 @@
  */
 
-WebInspector.CookiesTable = function(cookieDomain, expandable, deleteCallback)
+WebInspector.CookiesTable = function(cookieDomain, expandable, deleteCallback, refreshCallback)
 {
     this._cookieDomain = cookieDomain;
@@ -65 +65 @@
     this._dataGrid = new WebInspector.DataGrid(columns, null, deleteCallback ? this._onDeleteFromGrid.bind(this) : null);
     this._dataGrid.addEventListener("sorting changed", this._rebuildTable, this);
+    this._dataGrid.refreshCallback = refreshCallback;
 
     this.element = this._dataGrid.element;

trunk/Source/WebCore/inspector/front-end/DataGrid.js

@@ -156 +156 @@
 
 WebInspector.DataGrid.prototype = {
+    get refreshCallback()
+    {
+        return this._refreshCallback;
+    },
+        
+    set refreshCallback(refreshCallback)
+    {
+        this._refreshCallback = refreshCallback;
+    },
+    
     _ondblclick: function(event)
     {
@@ -879 +889 @@
     _contextMenuInDataTable: function(event)
     {
+        var contextMenu = new WebInspector.ContextMenu();
+
         var gridNode = this.dataGridNodeFromNode(event.target);
-        if (!gridNode || !gridNode.selectable)
-            return;
-        
-        if (gridNode.isEventWithinDisclosureTriangle(event))
-            return;
-      
-        var contextMenu = new WebInspector.ContextMenu();
-        
-        // FIXME: Use the column names for Editing, instead of just "Edit".
-        if (this.dataGrid._editCallback) {
-            if (gridNode === this.creationNode)
-                contextMenu.appendItem(WebInspector.UIString("Add New"), this._startEditing.bind(this, event.target));
-            else
-                contextMenu.appendItem(WebInspector.UIString("Edit"), this._startEditing.bind(this, event.target));
-        }
-        if (this.dataGrid._deleteCallback && gridNode !== this.creationNode)
-            contextMenu.appendItem(WebInspector.UIString("Delete"), this._deleteCallback.bind(this, gridNode));
+        if (this.dataGrid._refreshCallback && (!gridNode || gridNode !== this.creationNode))
+            contextMenu.appendItem(WebInspector.UIString("Refresh"), this._refreshCallback.bind(this));
+
+        if (gridNode && gridNode.selectable && !gridNode.isEventWithinDisclosureTriangle(event)) {
+            // FIXME: Use the column names for Editing, instead of just "Edit".
+            if (this.dataGrid._editCallback) {
+                if (gridNode === this.creationNode)
+                    contextMenu.appendItem(WebInspector.UIString("Add New"), this._startEditing.bind(this, event.target));
+                else
+                    contextMenu.appendItem(WebInspector.UIString("Edit"), this._startEditing.bind(this, event.target));
+            }
+            if (this.dataGrid._deleteCallback && gridNode !== this.creationNode)
+                contextMenu.appendItem(WebInspector.UIString("Delete"), this._deleteCallback.bind(this, gridNode));
+        }
         
         contextMenu.show(event);

trunk/Source/WebCore/inspector/front-end/ResourceCookiesView.js

@@ -73 +73 @@
         this.element.removeChildren();
 
-        this._cookiesTable = new WebInspector.CookiesTable(null, true, true);
+        this._cookiesTable = new WebInspector.CookiesTable(null, true);
         this._cookiesTable.addCookiesFolder(WebInspector.UIString("Request Cookies"), this._resource.requestCookies);
         this._cookiesTable.addCookiesFolder(WebInspector.UIString("Response Cookies"), this._resource.responseCookies);