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

Unified Diff: chrome/browser/resources/md_history/history_toolbar.js

Issue 2570253002: [MD History] Fix toolbar dates in grouped mode. (Closed)
Patch Set: rebase Created 3 years, 11 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
Index: chrome/browser/resources/md_history/history_toolbar.js
diff --git a/chrome/browser/resources/md_history/history_toolbar.js b/chrome/browser/resources/md_history/history_toolbar.js
index b7d8042e7b454934e4d438d8ffca6871d758e182..37007482d7c3ab8f5d2e79d8aa937074ced1e16d 100644
--- a/chrome/browser/resources/md_history/history_toolbar.js
+++ b/chrome/browser/resources/md_history/history_toolbar.js
@@ -60,15 +60,11 @@ Polymer({
notify: true,
},
- querying: Boolean,
-
hasMoreResults: Boolean,
- // The start time of the query range.
- queryStartTime: String,
+ querying: Boolean,
- // The end time of the query range.
- queryEndTime: String,
+ queryInfo: Object,
// Whether to show the menu promo (a tooltip that points at the menu button
// in narrow mode).
@@ -150,10 +146,13 @@ Polymer({
},
/** @private */
- getHistoryInterval_: function(queryStartTime, queryEndTime) {
- // TODO(calamity): Fix the format of these dates.
- return loadTimeData.getStringF(
- 'historyInterval', queryStartTime, queryEndTime);
+ getHistoryInterval_: function() {
+ var info = this.queryInfo;
+ if (this.groupedRange == HistoryRange.WEEK)
+ return info.queryInterval;
+
+ if (this.groupedRange == HistoryRange.MONTH)
+ return info.queryStartMonth;
},
/** @private */
« no previous file with comments | « chrome/browser/resources/md_history/history_toolbar.html ('k') | chrome/browser/resources/md_history/lazy_load.crisper.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698