Commit 884822d3 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

2010-11-22 Pavel Feldman <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: refactor ResourceView hierarchy.
        https://bugs.webkit.org/show_bug.cgi?id=49864

        This refactoring splits ResourceView.js into:
            NetworkItemView.js (tabbed pane)
            ResourceHeadersView.js (header tab)
            ResourceCookiesView.js (cookies tab)
            ResourceView.js (base class for content tab).
        CookiesTable was extracted from CookieItemsView and
        brushed up. headersVisible flag has been removed.

        * English.lproj/localizedStrings.js:
        * WebCore.gypi:
        * WebCore.vcproj/WebCore.vcproj:
        * inspector/front-end/CookieItemsView.js:
        (WebInspector.CookieItemsView):
        (WebInspector.CookieItemsView.prototype.get statusBarItems):
        (WebInspector.CookieItemsView.prototype.hide):
        (WebInspector.CookieItemsView.prototype.resize):
        (WebInspector.CookieItemsView.prototype._updateWithCookies):
        (WebInspector.CookieItemsView.prototype._filterCookiesForDomain):
        (WebInspector.CookieItemsView.prototype._deleteCookie):
        (WebInspector.CookieItemsView.prototype._deleteButtonClicked):
        (WebInspector.CookieItemsView.prototype._refreshButtonClicked):
        (WebInspector.SimpleCookiesTable):
        (WebInspector.SimpleCookiesTable.prototype.setCookies):
        (WebInspector.SimpleCookiesTable.prototype.resize):
        * inspector/front-end/CookiesTable.js: Added.
        (WebInspector.CookiesTable):
        (WebInspector.CookiesTable.prototype.updateWidths):
        (WebInspector.CookiesTable.prototype.setCookies):
        (WebInspector.CookiesTable.prototype.addCookiesFolder):
        (WebInspector.CookiesTable.prototype.get selectedCookie):
        (WebInspector.CookiesTable.prototype._rebuildTable):
        (WebInspector.CookiesTable.prototype.reset):
        (WebInspector.CookiesTable.prototype._populateNode):
        (WebInspector.CookiesTable.prototype._totalSize):
        (WebInspector.CookiesTable.prototype._sortCookies.localeCompare):
        (WebInspector.CookiesTable.prototype._sortCookies.numberCompare):
        (WebInspector.CookiesTable.prototype._sortCookies.expiresCompare):
        (WebInspector.CookiesTable.prototype._sortCookies):
        (WebInspector.CookiesTable.prototype._createGridNode):
        (WebInspector.CookiesTable.prototype._onDeleteFromGrid):
        * inspector/front-end/FileSystemView.js:
        (WebInspector.FileSystemView.prototype._selectFileSystemTab):
        (WebInspector.FileSystemView.prototype.selectTemporaryFileSystemTab):
        * inspector/front-end/FontView.js:
        (WebInspector.FontView.prototype.hasContent):
        (WebInspector.FontView.prototype._createContentIfNeeded):
        (WebInspector.FontView.prototype.show):
        (WebInspector.FontView.prototype.updateFontPreviewSize):
        * inspector/front-end/ImageView.js:
        (WebInspector.ImageView.prototype.hasContent):
        (WebInspector.ImageView.prototype.show):
        * inspector/front-end/NetworkItemView.js: Added.
        (WebInspector.NetworkItemView):
        (WebInspector.NetworkItemView.prototype.show):
        (WebInspector.NetworkItemView.prototype._selectTab):
        (WebInspector.NetworkItemView.prototype._tabSelected):
        (WebInspector.NetworkItemView.prototype.resize):
        (WebInspector.NetworkItemView.prototype.selectContentTab):
        * inspector/front-end/NetworkPanel.js:
        (WebInspector.NetworkPanel.prototype.show):
        (WebInspector.NetworkPanel.prototype.refreshResource):
        (WebInspector.NetworkPanel.prototype._showResource):
        (WebInspector.NetworkPanel.prototype._closeVisibleResource):
        * inspector/front-end/ResourceCookiesView.js: Added.
        (WebInspector.ResourceCookiesView):
        (WebInspector.ResourceCookiesView.prototype.show):
        * inspector/front-end/ResourceHeadersView.js: Added.
        (WebInspector.ResourceHeadersView):
        (WebInspector.ResourceHeadersView.prototype._refreshURL):
        (WebInspector.ResourceHeadersView.prototype._refreshQueryString):
        (WebInspector.ResourceHeadersView.prototype._refreshFormData):
        (WebInspector.ResourceHeadersView.prototype._refreshRequestPayload):
        (WebInspector.ResourceHeadersView.prototype._refreshParms):
        (WebInspector.ResourceHeadersView.prototype._toggleURLdecoding):
        (WebInspector.ResourceHeadersView.prototype._getHeaderValue):
        (WebInspector.ResourceHeadersView.prototype._refreshRequestHeaders):
        (WebInspector.ResourceHeadersView.prototype._refreshResponseHeaders):
        (WebInspector.ResourceHeadersView.prototype._refreshHTTPInformation):
        (WebInspector.ResourceHeadersView.prototype._refreshHeaders):
        * inspector/front-end/ResourceView.js:
        (WebInspector.ResourceView):
        (WebInspector.ResourceView.prototype.hasContent):
        * inspector/front-end/ResourcesPanel.js:
        (WebInspector.ResourcesPanel.prototype.show):
        (WebInspector.ResourcesPanel.prototype.showResource):
        (WebInspector.ResourcesPanel.prototype._showResourceView):
        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel.prototype.show):
        (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
        * inspector/front-end/SourceView.js:
        (WebInspector.SourceView):
        (WebInspector.SourceView.prototype.show):
        (WebInspector.SourceView.prototype.hide):
        (WebInspector.SourceView.prototype.resize):
        (WebInspector.SourceView.prototype.setupSourceFrameIfNeeded):
        (WebInspector.SourceView.prototype.hasContent):
        (WebInspector.SourceView.prototype.updateLocalContent):
        (WebInspector.SourceView.prototype.selectLocalContentTab):
        * inspector/front-end/StylesSidebarPane.js:
        * inspector/front-end/TabbedPane.js:
        (WebInspector.TabbedPane):
        (WebInspector.TabbedPane.prototype.appendTab):
        (WebInspector.TabbedPane.prototype.selectTab):
        (WebInspector.TabbedPane.prototype._showTab):
        (WebInspector.TabbedPane.prototype._hideTab):
        * inspector/front-end/WebKit.qrc:
        * inspector/front-end/inspector.css:
        (.webkit-line-gutter-backdrop):
        (.resource-view):
        (.resource-view.visible):
        (.resource-view.font):
        (.resource-view.image > .image):
        (.resource-view.image > .info):
        (.storage-view):
        (.storage-view .data-grid):
        (.storage-empty-view, .storage-view .storage-table-error):
        (.storage-view .storage-table-error):
        * inspector/front-end/inspector.html:
        * inspector/front-end/networkPanel.css:
        (.network-cell-subtitle):
        (.network-header-subtitle):
        (#network-views .network-item-view .tabbed-pane-header):
        (#network-views.small .network-item-view .tabbed-pane-header):
        (.network-item-view):
        (.network-item-view.visible):
        (.network-item-view .tabbed-pane-header):
        (.network-item-view .scope-bar li):
        (.resource-headers-view):
        (.resource-headers-view.visible):
        (.resource-headers-view .outline-disclosure .parent):
        (.resource-headers-view .outline-disclosure .children li):
        (.resource-headers-view .outline-disclosure li.expanded .header-count):
        (.resource-headers-view .outline-disclosure .header-name):
        (.resource-headers-view .outline-disclosure .header-value):
        (.resource-headers-view .outline-disclosure .raw-form-data):
        (.resource-cookies-view):
        (.resource-cookies-view.visible):
        (.resource-cookies-view .data-grid):
        (.resource-cookies-view .data-grid .row-group):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72655 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6ec0d8d5
2010-11-22 Pavel Feldman <pfeldman@chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: refactor ResourceView hierarchy.
https://bugs.webkit.org/show_bug.cgi?id=49864
This refactoring splits ResourceView.js into:
NetworkItemView.js (tabbed pane)
ResourceHeadersView.js (header tab)
ResourceCookiesView.js (cookies tab)
ResourceView.js (base class for content tab).
CookiesTable was extracted from CookieItemsView and
brushed up. headersVisible flag has been removed.
* English.lproj/localizedStrings.js:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* inspector/front-end/CookieItemsView.js:
(WebInspector.CookieItemsView):
(WebInspector.CookieItemsView.prototype.get statusBarItems):
(WebInspector.CookieItemsView.prototype.hide):
(WebInspector.CookieItemsView.prototype.resize):
(WebInspector.CookieItemsView.prototype._updateWithCookies):
(WebInspector.CookieItemsView.prototype._filterCookiesForDomain):
(WebInspector.CookieItemsView.prototype._deleteCookie):
(WebInspector.CookieItemsView.prototype._deleteButtonClicked):
(WebInspector.CookieItemsView.prototype._refreshButtonClicked):
(WebInspector.SimpleCookiesTable):
(WebInspector.SimpleCookiesTable.prototype.setCookies):
(WebInspector.SimpleCookiesTable.prototype.resize):
* inspector/front-end/CookiesTable.js: Added.
(WebInspector.CookiesTable):
(WebInspector.CookiesTable.prototype.updateWidths):
(WebInspector.CookiesTable.prototype.setCookies):
(WebInspector.CookiesTable.prototype.addCookiesFolder):
(WebInspector.CookiesTable.prototype.get selectedCookie):
(WebInspector.CookiesTable.prototype._rebuildTable):
(WebInspector.CookiesTable.prototype.reset):
(WebInspector.CookiesTable.prototype._populateNode):
(WebInspector.CookiesTable.prototype._totalSize):
(WebInspector.CookiesTable.prototype._sortCookies.localeCompare):
(WebInspector.CookiesTable.prototype._sortCookies.numberCompare):
(WebInspector.CookiesTable.prototype._sortCookies.expiresCompare):
(WebInspector.CookiesTable.prototype._sortCookies):
(WebInspector.CookiesTable.prototype._createGridNode):
(WebInspector.CookiesTable.prototype._onDeleteFromGrid):
* inspector/front-end/FileSystemView.js:
(WebInspector.FileSystemView.prototype._selectFileSystemTab):
(WebInspector.FileSystemView.prototype.selectTemporaryFileSystemTab):
* inspector/front-end/FontView.js:
(WebInspector.FontView.prototype.hasContent):
(WebInspector.FontView.prototype._createContentIfNeeded):
(WebInspector.FontView.prototype.show):
(WebInspector.FontView.prototype.updateFontPreviewSize):
* inspector/front-end/ImageView.js:
(WebInspector.ImageView.prototype.hasContent):
(WebInspector.ImageView.prototype.show):
* inspector/front-end/NetworkItemView.js: Added.
(WebInspector.NetworkItemView):
(WebInspector.NetworkItemView.prototype.show):
(WebInspector.NetworkItemView.prototype._selectTab):
(WebInspector.NetworkItemView.prototype._tabSelected):
(WebInspector.NetworkItemView.prototype.resize):
(WebInspector.NetworkItemView.prototype.selectContentTab):
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkPanel.prototype.show):
(WebInspector.NetworkPanel.prototype.refreshResource):
(WebInspector.NetworkPanel.prototype._showResource):
(WebInspector.NetworkPanel.prototype._closeVisibleResource):
* inspector/front-end/ResourceCookiesView.js: Added.
(WebInspector.ResourceCookiesView):
(WebInspector.ResourceCookiesView.prototype.show):
* inspector/front-end/ResourceHeadersView.js: Added.
(WebInspector.ResourceHeadersView):
(WebInspector.ResourceHeadersView.prototype._refreshURL):
(WebInspector.ResourceHeadersView.prototype._refreshQueryString):
(WebInspector.ResourceHeadersView.prototype._refreshFormData):
(WebInspector.ResourceHeadersView.prototype._refreshRequestPayload):
(WebInspector.ResourceHeadersView.prototype._refreshParms):
(WebInspector.ResourceHeadersView.prototype._toggleURLdecoding):
(WebInspector.ResourceHeadersView.prototype._getHeaderValue):
(WebInspector.ResourceHeadersView.prototype._refreshRequestHeaders):
(WebInspector.ResourceHeadersView.prototype._refreshResponseHeaders):
(WebInspector.ResourceHeadersView.prototype._refreshHTTPInformation):
(WebInspector.ResourceHeadersView.prototype._refreshHeaders):
* inspector/front-end/ResourceView.js:
(WebInspector.ResourceView):
(WebInspector.ResourceView.prototype.hasContent):
* inspector/front-end/ResourcesPanel.js:
(WebInspector.ResourcesPanel.prototype.show):
(WebInspector.ResourcesPanel.prototype.showResource):
(WebInspector.ResourcesPanel.prototype._showResourceView):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype.show):
(WebInspector.ScriptsPanel.prototype._showScriptOrResource):
* inspector/front-end/SourceView.js:
(WebInspector.SourceView):
(WebInspector.SourceView.prototype.show):
(WebInspector.SourceView.prototype.hide):
(WebInspector.SourceView.prototype.resize):
(WebInspector.SourceView.prototype.setupSourceFrameIfNeeded):
(WebInspector.SourceView.prototype.hasContent):
(WebInspector.SourceView.prototype.updateLocalContent):
(WebInspector.SourceView.prototype.selectLocalContentTab):
* inspector/front-end/StylesSidebarPane.js:
* inspector/front-end/TabbedPane.js:
(WebInspector.TabbedPane):
(WebInspector.TabbedPane.prototype.appendTab):
(WebInspector.TabbedPane.prototype.selectTab):
(WebInspector.TabbedPane.prototype._showTab):
(WebInspector.TabbedPane.prototype._hideTab):
* inspector/front-end/WebKit.qrc:
* inspector/front-end/inspector.css:
(.webkit-line-gutter-backdrop):
(.resource-view):
(.resource-view.visible):
(.resource-view.font):
(.resource-view.image > .image):
(.resource-view.image > .info):
(.storage-view):
(.storage-view .data-grid):
(.storage-empty-view, .storage-view .storage-table-error):
(.storage-view .storage-table-error):
* inspector/front-end/inspector.html:
* inspector/front-end/networkPanel.css:
(.network-cell-subtitle):
(.network-header-subtitle):
(#network-views .network-item-view .tabbed-pane-header):
(#network-views.small .network-item-view .tabbed-pane-header):
(.network-item-view):
(.network-item-view.visible):
(.network-item-view .tabbed-pane-header):
(.network-item-view .scope-bar li):
(.resource-headers-view):
(.resource-headers-view.visible):
(.resource-headers-view .outline-disclosure .parent):
(.resource-headers-view .outline-disclosure .children li):
(.resource-headers-view .outline-disclosure li.expanded .header-count):
(.resource-headers-view .outline-disclosure .header-name):
(.resource-headers-view .outline-disclosure .header-value):
(.resource-headers-view .outline-disclosure .raw-form-data):
(.resource-cookies-view):
(.resource-cookies-view.visible):
(.resource-cookies-view .data-grid):
(.resource-cookies-view .data-grid .row-group):
2010-11-24 Pavel Feldman <pfeldman@chromium.org>
Reviewed by Yury Semikhatsky.
Bvar localizedStrings = new Object;
......
......@@ -4433,6 +4433,7 @@
'inspector/front-end/ContextMenu.js',
'inspector/front-end/CookieItemsView.js',
'inspector/front-end/CookieParser.js',
'inspector/front-end/CookiesTable.js',
'inspector/front-end/CSSCompletions.js',
'inspector/front-end/CSSStyleModel.js',
'inspector/front-end/Database.js',
......@@ -4467,6 +4468,7 @@
'inspector/front-end/inspector.js',
'inspector/front-end/KeyboardShortcut.js',
'inspector/front-end/MetricsSidebarPane.js',
'inspector/front-end/NetworkItemView.js',
'inspector/front-end/NetworkPanel.js',
'inspector/front-end/Object.js',
'inspector/front-end/ObjectPropertiesSection.js',
......@@ -4482,7 +4484,9 @@
'inspector/front-end/RemoteObject.js',
'inspector/front-end/Resource.js',
'inspector/front-end/ResourceCategory.js',
'inspector/front-end/ResourceCookiesView.js',
'inspector/front-end/ResourceManager.js',
'inspector/front-end/ResourceHeadersView.js',
'inspector/front-end/ResourceView.js',
'inspector/front-end/ResourcesPanel.js',
'inspector/front-end/ScopeChainSidebarPane.js',
......
......@@ -64749,6 +64749,10 @@
RelativePath="..\inspector\front-end\CookieItemsView.js"
>
</File>
<File
RelativePath="..\inspector\front-end\CookiesTable.js"
>
</File>
<File
RelativePath="..\inspector\front-end\CookieParser.js"
>
......@@ -64905,6 +64909,10 @@
RelativePath="..\inspector\front-end\networkPanel.css"
>
</File>
<File
RelativePath="..\inspector\front-end\NetworkItemView.js"
>
</File>
<File
RelativePath="..\inspector\front-end\NetworkPanel.js"
>
......@@ -64969,6 +64977,14 @@
RelativePath="..\inspector\front-end\ResourceCategory.js"
>
</File>
<File
RelativePath="..\inspector\front-end\ResourceCookiesView.js"
>
</File>
<File
RelativePath="..\inspector\front-end\ResourceHeadersView.js"
>
</File>
<File
RelativePath="..\inspector\front-end\ResourceManager.js"
>
......@@ -27,149 +27,19 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
WebInspector.CookiesTable = function()
{
WebInspector.View.call(this);
this.element.addStyleClass("table");
}
WebInspector.CookiesTable.prototype = {
resize: function()
{
if (!this._dataGrid)
return;
if (this._autoSizingDone)
this._dataGrid.updateWidths();
else {
this._autoSizingDone = true;
this._dataGrid.autoSizeColumns(4, 45, 1);
}
},
_createDataGrid: function(expandable)
{
var columns = { 0: {}, 1: {}, 2: {}, 3: {}, 4: {}, 5: {}, 6: {}, 7: {} };
columns[0].title = WebInspector.UIString("Name");
columns[0].sortable = true;
columns[0].disclosure = expandable;
columns[1].title = WebInspector.UIString("Value");
columns[1].sortable = true;
columns[2].title = WebInspector.UIString("Domain");
columns[2].sortable = true;
columns[3].title = WebInspector.UIString("Path");
columns[3].sortable = true;
columns[4].title = WebInspector.UIString("Expires");
columns[4].sortable = true;
columns[5].title = WebInspector.UIString("Size");
columns[5].aligned = "right";
columns[5].sortable = true;
columns[6].title = WebInspector.UIString("HTTP");
columns[6].aligned = "centered";
columns[6].sortable = true;
columns[7].title = WebInspector.UIString("Secure");
columns[7].aligned = "centered";
columns[7].sortable = true;
var deleteCallback = this._deleteCookieCallback ? this._deleteCookieCallback.bind(this) : null;
this._dataGrid = new WebInspector.DataGrid(columns, null, deleteCallback);
this._dataGrid.addEventListener("sorting changed", this._populateDataGrid, this);
this.element.appendChild(this._dataGrid.element);
},
_populateCookies: function(parentNode, cookies)
{
var selectedCookie = this._dataGrid.selectedNode ? this._dataGrid.selectedNode.cookie : null;
parentNode.removeChildren();
if (!cookies)
return;
this._sortCookies(cookies);
var totalSize = 0;
for (var i = 0; i < cookies.length; ++i) {
var cookieNode = this._createGridNode(cookies[i]);
parentNode.appendChild(cookieNode);
if (selectedCookie === cookies[i])
cookieNode.selected = true;
}
},
_sortCookies: function(cookies)
{
var sortDirection = this._dataGrid.sortOrder === "ascending" ? 1 : -1;
function localeCompare(field, cookie1, cookie2)
{
return sortDirection * (cookie1[field] + "").localeCompare(cookie2[field] + "")
}
function numberCompare(field, cookie1, cookie2)
{
return sortDirection * (cookie1[field] - cookie2[field]);
}
function expiresCompare(cookie1, cookie2)
{
if (cookie1.session !== cookie2.session)
return sortDirection * (cookie1.session ? 1 : -1);
if (cookie1.session)
return 0;
return sortDirection * (cookie1.expires - cookie2.expires);
}
var comparator;
switch (parseInt(this._dataGrid.sortColumnIdentifier)) {
case 0: comparator = localeCompare.bind(this, "name"); break;
case 1: comparator = localeCompare.bind(this, "value"); break;
case 2: comparator = localeCompare.bind(this, "domain"); break;
case 3: comparator = localeCompare.bind(this, "path"); break;
case 4: comparator = expiresCompare; break;
case 5: comparator = numberCompare.bind(this, "size"); break;
case 6: comparator = localeCompare.bind(this, "httpOnly"); break;
case 7: comparator = localeCompare.bind(this, "secure"); break;
default: localeCompare.bind(this, "name");
}
cookies.sort(comparator);
},
_createGridNode: function(cookie)
{
var data = {};
data[0] = cookie.name;
data[1] = cookie.value;
data[2] = cookie.domain || "";
data[3] = cookie.path || "";
data[4] = cookie.type === WebInspector.Cookie.Type.Request ? "" :
(cookie.session ? WebInspector.UIString("Session") : new Date(cookie.expires).toGMTString());
data[5] = cookie.size;
data[6] = (cookie.httpOnly ? "\u2713" : ""); // Checkmark
data[7] = (cookie.secure ? "\u2713" : ""); // Checkmark
var node = new WebInspector.DataGridNode(data);
node.cookie = cookie;
node.selectable = true;
return node;
}
};
WebInspector.CookiesTable.prototype.__proto__ = WebInspector.View.prototype;
WebInspector.CookieItemsView = function(treeElement, cookieDomain)
{
WebInspector.CookiesTable.call(this);
WebInspector.View.call(this);
this.element.addStyleClass("storage-view");
this.deleteButton = new WebInspector.StatusBarButton(WebInspector.UIString("Delete"), "delete-storage-status-bar-item");
this.deleteButton.visible = false;
this.deleteButton.addEventListener("click", this._deleteButtonClicked.bind(this), false);
this._deleteButton = new WebInspector.StatusBarButton(WebInspector.UIString("Delete"), "delete-storage-status-bar-item");
this._deleteButton.visible = false;
this._deleteButton.addEventListener("click", this._deleteButtonClicked.bind(this), false);
this._refreshButton = new WebInspector.StatusBarButton(WebInspector.UIString("Refresh"), "refresh-storage-status-bar-item");
this._refreshButton.addEventListener("click", this._refreshButtonClicked.bind(this), false);
this.refreshButton = new WebInspector.StatusBarButton(WebInspector.UIString("Refresh"), "refresh-storage-status-bar-item");
this.refreshButton.addEventListener("click", this._refreshButtonClicked.bind(this), false);
this._treeElement = treeElement;
this._cookieDomain = cookieDomain;
......@@ -182,7 +52,7 @@ WebInspector.CookieItemsView = function(treeElement, cookieDomain)
WebInspector.CookieItemsView.prototype = {
get statusBarItems()
{
return [this.refreshButton.element, this.deleteButton.element];
return [this._refreshButton.element, this._deleteButton.element];
},
show: function(parentElement)
......@@ -194,7 +64,13 @@ WebInspector.CookieItemsView.prototype = {
hide: function()
{
WebInspector.View.prototype.hide.call(this);
this.deleteButton.visible = false;
this._deleteButton.visible = false;
},
resize: function()
{
if (this._cookiesTable)
this._cookiesTable.updateWidths();
},
_update: function()
......@@ -204,47 +80,35 @@ WebInspector.CookieItemsView.prototype = {
_updateWithCookies: function(allCookies, isAdvanced)
{
if (isAdvanced)
this._filterCookiesForDomain(allCookies);
else
this._cookies = allCookies;
this._cookies = isAdvanced ? this._filterCookiesForDomain(allCookies) : allCookies;
if (!this._cookies.length) {
// Nothing to show.
this._emptyMsgElement.removeStyleClass("hidden");
this.deleteButton.visible = false;
if (this._dataGrid)
this._dataGrid.element.addStyleClass("hidden");
this._deleteButton.visible = false;
if (this._cookiesTable)
this._cookiesTable.element.addStyleClass("hidden");
return;
}
if (!this._dataGrid) {
if (isAdvanced) {
this._createDataGrid();
this._populateDataGrid();
this._dataGrid.autoSizeColumns(6, 33);
this._treeElement.subtitle = String.sprintf(WebInspector.UIString("%d cookies (%s)"), this._cookies.length,
Number.bytesToString(this._totalSize, WebInspector.UIString));
} else {
this._createSimpleDataGrid();
this._populateSimpleDataGrid();
this._dataGrid.autoSizeColumns(20, 80);
}
} else {
if (isAdvanced)
this._populateDataGrid();
else
this._populateSimpleDataGrid();
if (!this._cookiesTable) {
this._cookiesTable = isAdvanced ? new WebInspector.CookiesTable(this._cookieDomain, false, this._deleteCookie.bind(this)) : new WebInspector.SimpleCookiesTable();
this.element.appendChild(this._cookiesTable.element);
}
this._dataGrid.element.removeStyleClass("hidden");
this._cookiesTable.setCookies(this._cookies);
this._cookiesTable.element.removeStyleClass("hidden");
this._emptyMsgElement.addStyleClass("hidden");
if (isAdvanced)
this.deleteButton.visible = true;
if (isAdvanced) {
this._treeElement.subtitle = String.sprintf(WebInspector.UIString("%d cookies (%s)"), this._cookies.length,
Number.bytesToString(this._totalSize, WebInspector.UIString));
this._deleteButton.visible = true;
}
},
_filterCookiesForDomain: function(allCookies)
{
this._cookies = [];
var cookies = [];
var resourceURLsForDocumentURL = [];
this._totalSize = 0;
......@@ -265,34 +129,52 @@ WebInspector.CookieItemsView.prototype = {
this._totalSize += size;
if (!pushed) {
pushed = true;
this._cookies.push(allCookies[i]);
cookies.push(allCookies[i]);
}
}
}
}
return cookies;
},
_populateDataGrid: function()
_deleteCookie: function(cookie)
{
this._populateCookies(this._dataGrid, this._cookies);
InspectorBackend.deleteCookie(cookie.name, this._cookieDomain);
this._update();
},
_createSimpleDataGrid: function()
_deleteButtonClicked: function()
{
var columns = {};
columns[0] = {};
columns[1] = {};
columns[0].title = WebInspector.UIString("Name");
columns[1].title = WebInspector.UIString("Value");
this._dataGrid = new WebInspector.DataGrid(columns);
this.element.appendChild(this._dataGrid.element);
this._dataGrid.updateWidths();
if (this._cookiesTable.selectedCookie)
this._deleteCookie(this._cookiesTable.selectedCookie);
},
_populateSimpleDataGrid: function()
_refreshButtonClicked: function(event)
{
this._update();
}
}
WebInspector.CookieItemsView.prototype.__proto__ = WebInspector.View.prototype;
WebInspector.SimpleCookiesTable = function()
{
this.element = document.createElement("div");
var columns = {};
columns[0] = {};
columns[1] = {};
columns[0].title = WebInspector.UIString("Name");
columns[1].title = WebInspector.UIString("Value");
this._dataGrid = new WebInspector.DataGrid(columns);
this._dataGrid.autoSizeColumns(20, 80);
this.element.appendChild(this._dataGrid.element);
this._dataGrid.updateWidths();
}
WebInspector.SimpleCookiesTable.prototype = {
setCookies: function(cookies)
{
var cookies = this._cookies;
this._dataGrid.removeChildren();
var addedCookies = {};
for (var i = 0; i < cookies.length; ++i) {
......@@ -310,26 +192,9 @@ WebInspector.CookieItemsView.prototype = {
this._dataGrid.children[0].selected = true;
},
_deleteButtonClicked: function(event)
{
if (!this._dataGrid || !this._dataGrid.selectedNode)
return;
this._deleteCookieCallback(this._dataGrid.selectedNode);
},
_deleteCookieCallback: function(node)
{
var cookie = node.cookie;
InspectorBackend.deleteCookie(cookie.name, this._cookieDomain);
this._update();
},
_refreshButtonClicked: function(event)
resize: function()
{
this._update();
if (this._dataGrid)
this._dataGrid.updateWidths();
}
}
WebInspector.CookieItemsView.prototype.__proto__ = WebInspector.CookiesTable.prototype;
/*
* Copyright (C) 2009 Apple Inc. All rights reserved.
* Copyright (C) 2009 Joseph Pecoraro
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
WebInspector.CookiesTable = function(cookieDomain, expandable, deleteCallback)
{
this._cookieDomain = cookieDomain;
var columns = { 0: {}, 1: {}, 2: {}, 3: {}, 4: {}, 5: {}, 6: {}, 7: {} };
columns[0].title = WebInspector.UIString("Name");
columns[0].sortable = true;
columns[0].disclosure = expandable;
columns[0].width = "24%";
columns[1].title = WebInspector.UIString("Value");
columns[1].sortable = true;
columns[1].width = "34%";
columns[2].title = WebInspector.UIString("Domain");
columns[2].sortable = true;
columns[2].width = "7%";
columns[3].title = WebInspector.UIString("Path");
columns[3].sortable = true;
columns[3].width = "7%";
columns[4].title = WebInspector.UIString("Expires");
columns[4].sortable = true;
columns[4].width = "7%";
columns[5].title = WebInspector.UIString("Size");
columns[5].aligned = "right";
columns[5].sortable = true;
columns[5].width = "7%";
columns[6].title = WebInspector.UIString("HTTP");
columns[6].aligned = "centered";