Diff
Modified: trunk/Source/WebCore/ChangeLog (113434 => 113435)
--- trunk/Source/WebCore/ChangeLog 2012-04-06 14:43:46 UTC (rev 113434)
+++ trunk/Source/WebCore/ChangeLog 2012-04-06 15:04:31 UTC (rev 113435)
@@ -1,3 +1,26 @@
+2012-04-06 Pavel Feldman <[email protected]>
+
+ Web Inspector: remove url from the saved urls map before the save action.
+ https://bugs.webkit.org/show_bug.cgi?id=83364
+
+ Reviewed by Yury Semikhatsky.
+
+ URL gets added back upon successful save anyways, but if user chooses cancel saving,
+ we stop bugging him with the save-as dialog.
+
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkLogView.prototype._exportAll):
+ (WebInspector.NetworkLogView.prototype._exportResource):
+ * inspector/front-end/ResourcesPanel.js:
+ (WebInspector.FrameResourceTreeElement.prototype._appendSaveAsAction.doSave):
+ (WebInspector.ResourceRevisionTreeElement.prototype._handleContextMenuEvent.doSave):
+ * inspector/front-end/TextViewer.js:
+ (WebInspector.TextViewer.prototype._contextMenu):
+ (WebInspector.TextViewer.prototype._commitEditing):
+ * inspector/front-end/TimelineModel.js:
+ (WebInspector.TimelineModel.prototype.saveToFile):
+ * inspector/front-end/inspector.js:
+
2012-04-06 Andrey Kosyakov <[email protected]>
Web Inspector: display frame details in popover on frame strip in Timeline panel
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (113434 => 113435)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-04-06 14:43:46 UTC (rev 113434)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-04-06 15:04:31 UTC (rev 113435)
@@ -999,13 +999,13 @@
log: (new WebInspector.HARLog(this._resources)).build()
};
- InspectorFrontendHost.save(WebInspector.inspectedPageDomain + ".har", JSON.stringify(harArchive, null, 2), true);
+ WebInspector.save(WebInspector.inspectedPageDomain + ".har", JSON.stringify(harArchive, null, 2), true);
},
_exportResource: function(resource)
{
var har = (new WebInspector.HAREntry(resource)).build();
- InspectorFrontendHost.save(resource.displayName + ".har", JSON.stringify(har, null, 2), true);
+ WebInspector.save(resource.displayName + ".har", JSON.stringify(har, null, 2), true);
},
_clearBrowserCache: function(event)
Modified: trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js (113434 => 113435)
--- trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2012-04-06 14:43:46 UTC (rev 113434)
+++ trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2012-04-06 15:04:31 UTC (rev 113435)
@@ -1278,7 +1278,7 @@
function doSave(forceSaveAs, content)
{
- InspectorFrontendHost.save(this._resource.url, content, forceSaveAs);
+ WebInspector.save(this._resource.url, content, forceSaveAs);
}
function save(forceSaveAs)
@@ -2049,7 +2049,7 @@
if (InspectorFrontendHost.canSave()) {
function doSave(forceSaveAs, content)
{
- InspectorFrontendHost.save(this._revision.resource.url, content, forceSaveAs);
+ WebInspector.save(this._revision.resource.url, content, forceSaveAs);
}
function save(forceSaveAs)
Modified: trunk/Source/WebCore/inspector/front-end/TextViewer.js (113434 => 113435)
--- trunk/Source/WebCore/inspector/front-end/TextViewer.js 2012-04-06 14:43:46 UTC (rev 113434)
+++ trunk/Source/WebCore/inspector/front-end/TextViewer.js 2012-04-06 15:04:31 UTC (rev 113435)
@@ -291,8 +291,8 @@
this._delegate.populateTextAreaContextMenu(contextMenu, target && target.lineNumber);
}
if (this._url) {
- contextMenu.appendItem(WebInspector.UIString("Save"), InspectorFrontendHost.save.bind(InspectorFrontendHost, this._url, this._textModel.text, false));
- contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Save as..." : "Save As..."), InspectorFrontendHost.save.bind(InspectorFrontendHost, this._url, this._textModel.text, true));
+ contextMenu.appendItem(WebInspector.UIString("Save"), WebInspector.save.bind(WebInspector, this._url, this._textModel.text, false));
+ contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Save as..." : "Save As..."), WebInspector.save.bind(WebInspector, this._url, this._textModel.text, true));
}
contextMenu.show(event);
@@ -305,7 +305,7 @@
this._delegate.commitEditing();
if (this._url && WebInspector.isURLSaved(this._url))
- InspectorFrontendHost.save(this._url, this._textModel.text, false);
+ WebInspector.save(this._url, this._textModel.text, false);
return true;
},
Modified: trunk/Source/WebCore/inspector/front-end/TimelineModel.js (113434 => 113435)
--- trunk/Source/WebCore/inspector/front-end/TimelineModel.js 2012-04-06 14:43:46 UTC (rev 113434)
+++ trunk/Source/WebCore/inspector/front-end/TimelineModel.js 2012-04-06 15:04:31 UTC (rev 113435)
@@ -203,7 +203,7 @@
var now = new Date();
var fileName = "TimelineRawData-" + now.toISO8601Compact() + ".json";
- InspectorFrontendHost.save(fileName, records.join(",\n"), true);
+ WebInspector.save(fileName, records.join(",\n"), true);
},
reset: function()
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (113434 => 113435)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2012-04-06 14:43:46 UTC (rev 113434)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2012-04-06 15:04:31 UTC (rev 113435)
@@ -1021,6 +1021,16 @@
WebInspector.inspectorView.setCurrentPanel(toolbarItem.panel);
}
+WebInspector.save = function(url, content, forceSaveAs)
+{
+ // Remove this url from the saved URLs while it is being saved.
+ var savedURLs = WebInspector.settings.savedURLs.get();
+ delete savedURLs[url];
+ WebInspector.settings.savedURLs.set(savedURLs);
+
+ InspectorFrontendHost.save(url, content, forceSaveAs);
+}
+
WebInspector.savedURL = function(url)
{
var savedURLs = WebInspector.settings.savedURLs.get();
