Chromium Code Reviews| Index: chrome/browser/resources/md_history/history_item.js |
| diff --git a/chrome/browser/resources/md_history/history_item.js b/chrome/browser/resources/md_history/history_item.js |
| index 4b988cd6437cc1bde1cccea3e4f79947977d9da0..ff429dbc18192d713858f144015d054feb7c6d53 100644 |
| --- a/chrome/browser/resources/md_history/history_item.js |
| +++ b/chrome/browser/resources/md_history/history_item.js |
| @@ -6,12 +6,18 @@ Polymer({ |
| is: 'history-item', |
| properties: { |
| - timeAccessed_: { |
| + // The date of these history items. |
| + historyDate: { |
| type: String, |
| value: '' |
| }, |
| - websiteTitle_: { |
| + timeAccessed: { |
| + type: String, |
| + value: '' |
| + }, |
| + |
| + websiteTitle: { |
| type: String, |
| value: '' |
| }, |
| @@ -20,7 +26,7 @@ Polymer({ |
| // Gives the user some idea of which history items are different pages |
| // belonging to the same site, and can be used to look for more items |
| // from the same site. |
| - websiteDomain_: { |
| + websiteDomain: { |
| type: String, |
| value: '' |
| }, |
| @@ -28,7 +34,7 @@ Polymer({ |
| // The website url is used to define where the link should take you if |
| // you click on the title, and also to define which icon the history-item |
| // should display. |
| - websiteUrl_: { |
| + websiteUrl: { |
| type: String, |
| value: '', |
| observer: 'showIcon_' |
| @@ -42,7 +48,7 @@ Polymer({ |
| }, |
| // The time in seconds of when the website was accessed. |
| - timestamp_: { |
| + timestamp: { |
| type: Number, |
| value: 0 |
| }, |
| @@ -51,6 +57,23 @@ Polymer({ |
| type: Boolean, |
| value: false, |
| notify: true |
| + }, |
| + |
| + isCardStart: { |
| + type: Boolean, |
| + value: false, |
| + reflectToAttribute: true |
| + }, |
| + |
| + isCardEnd: { |
| + type: Boolean, |
| + value: false, |
| + reflectToAttribute: true |
| + }, |
| + |
| + hasTimeGap: { |
| + type: Boolean, |
| + value: false |
| } |
| }, |
| @@ -72,7 +95,7 @@ Polymer({ |
| */ |
| showIcon_: function() { |
| this.$['website-icon'].style.backgroundImage = |
| - getFaviconImageSet(this.websiteUrl_); |
| + getFaviconImageSet(this.websiteUrl); |
| }, |
| /** |
| @@ -85,7 +108,7 @@ Polymer({ |
| this.fire('toggle-menu', { |
| x: position.left, |
| y: position.top, |
| - accessTime: this.timestamp_ |
| + accessTime: this.timestamp |
| }); |
| // Stops the 'tap' event from closing the menu when it opens. |
| @@ -93,6 +116,7 @@ Polymer({ |
| }, |
| selectionNotAllowed_: function() { |
| + // return false; |
|
tsergeant
2016/02/11 02:43:02
Remove this.
yingran
2016/02/12 02:03:05
Done.
|
| return !loadTimeData.getBoolean('allowDeletingHistory'); |
| } |
| }); |