Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: chrome/browser/resources/history2.html

Issue 7086030: Refresh the history page if history entries get deleted, except for when currently editing entries (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/history.js ('k') | chrome/browser/ui/webui/history2_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/history2.html
diff --git a/chrome/browser/resources/history2.html b/chrome/browser/resources/history2.html
index 5c369b33fffc08c8a9ef6ef20263b3456c35ad7a..eb27f3bb70f4c01ec6a5445f37e263ae3433ccfc 100644
--- a/chrome/browser/resources/history2.html
+++ b/chrome/browser/resources/history2.html
@@ -531,6 +531,14 @@ HistoryView.prototype.toggleEditMode = function() {
};
/**
+ * @return {boolean} Whether we are in edit mode where history items can be
+ * deleted
+ */
+HistoryView.prototype.getEditMode = function() {
+ return this.model_.getEditMode();
+};
+
+/**
* Reload the current view.
*/
HistoryView.prototype.reload = function() {
@@ -1059,7 +1067,6 @@ function deleteComplete() {
deleteNextInQueue();
} else {
deleteQueue = [];
- historyView.reload();
}
}
@@ -1073,6 +1080,17 @@ function deleteFailed() {
deleteInFlight = false;
setTimeout(deleteNextInQueue, 500);
}
+
+/**
+ * We're called when something is deleted (either by us or by someone
+ * else).
+ */
+function historyDeleted() {
+ window.console.log('History deleted');
+ var anyChecked = document.querySelector('.entry input:checked') != null;
+ if (!(historyView.getEditMode() && anyChecked))
+ historyView.reload();
+}
</script>
<link rel="stylesheet" href="webui2.css">
<style>
« no previous file with comments | « chrome/browser/resources/history.js ('k') | chrome/browser/ui/webui/history2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698