diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 01:24:08 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 01:24:08 +0000 |
| commit | 153c6986284b7fc39fe5a875e0df5c8f29120957 (patch) | |
| tree | 6f891ff5bbf3f2029d8c8a011d8916de6f2bfe1f /chrome/browser/resources | |
| parent | 193e1cdbcaac17d0fac6093f9bd63cd5477e4325 (diff) | |
| download | chromium_src-153c6986284b7fc39fe5a875e0df5c8f29120957.zip chromium_src-153c6986284b7fc39fe5a875e0df5c8f29120957.tar.gz chromium_src-153c6986284b7fc39fe5a875e0df5c8f29120957.tar.bz2 | |
Stop history search going on beyond the start of history.
Stop losing first-searches on history page due to
BUG=8438,8456
Review URL: http://codereview.chromium.org/43054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/history.html | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html index 0b1e9b6..cf88429 100644 --- a/chrome/browser/resources/history.html +++ b/chrome/browser/resources/history.html @@ -1,5 +1,5 @@ <!DOCTYPE HTML> -<html id="t"> +<html id="t" jsvalues="dir:textdirection;"> <head> <meta charset="utf-8"> <title jscontent="title"></title> @@ -259,7 +259,7 @@ HistoryModel.prototype.getSearchText = function() { HistoryModel.prototype.requestPage = function(page) { this.requestedPage_ = page; this.changed = true; - this.updateSearch_(); + this.updateSearch_(false); } /** @@ -267,9 +267,9 @@ HistoryModel.prototype.requestPage = function(page) { * @param {String} term The search term that the results are for. * @param {Array} results A list of results */ -HistoryModel.prototype.addResults = function(term, results) { +HistoryModel.prototype.addResults = function(info, results) { this.inFlight_ = false; - if (term != this.searchText_) { + if (info.term != this.searchText_) { // If our results aren't for our current search term, they're rubbish. return; } @@ -302,7 +302,7 @@ HistoryModel.prototype.addResults = function(term, results) { if (results.length) this.changed = true; - this.updateSearch_(); + this.updateSearch_(info.finished); } /** @@ -354,8 +354,9 @@ HistoryModel.prototype.clearModel_ = function() { * page. If we think we can fill the page, call the view and let it know * we're ready to show something. */ -HistoryModel.prototype.updateSearch_ = function() { - if (this.searchText_ && this.searchDepth_ >= MAX_SEARCH_DEPTH_MONTHS) { +HistoryModel.prototype.updateSearch_ = function(finished) { + if ((this.searchText_ && this.searchDepth_ >= MAX_SEARCH_DEPTH_MONTHS) || + finished) { // We have maxed out. There will be no more data. this.complete_ = true; this.view_.onModelReady(); @@ -761,15 +762,15 @@ function deleteNextInQueue() { /** * Our history system calls this function with results from searches. */ -function historyResult(term, results) { - historyModel.addResults(term, results); +function historyResult(info, results) { + historyModel.addResults(info, results); } /** * Our history system calls this function when a deletion has finished. */ function deleteComplete() { - historyView.reload(); + window.console.log("Delete complete"); deleteInFlight = false; if (deleteQueue.length > 1) { deleteQueue = deleteQueue.slice(1, deleteQueue.length); @@ -782,10 +783,20 @@ function deleteComplete() { * another delete is in-progress). */ function deleteFailed() { + window.console.log("Delete failed"); // The deletion failed - try again later. 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"); + historyView.reload(); +} </script> <style type="text/css"> body { |