Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | |
| 4 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared _menu.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared _menu.html"> |
| 5 <link rel="import" href="chrome://history/constants.html"> | 6 <link rel="import" href="chrome://history/constants.html"> |
| 6 <link rel="import" href="chrome://history/history_item.html"> | 7 <link rel="import" href="chrome://history/history_item.html"> |
| 7 <link rel="import" href="chrome://history/shared_style.html"> | 8 <link rel="import" href="chrome://history/shared_style.html"> |
| 8 | 9 |
| 9 <dom-module id="history-list"> | 10 <dom-module id="history-list"> |
| 10 <template> | 11 <template> |
| 11 <style include="shared-style"></style> | 12 <style include="shared-style"></style> |
| 12 <style> | 13 <style> |
| 13 :host { | 14 :host { |
| 14 display: flex; | 15 display: flex; |
| 15 flex-direction: column; | 16 flex-direction: column; |
| 17 position: relative; | |
| 16 } | 18 } |
| 17 | 19 |
| 18 #infinite-list { | 20 #infinite-list { |
| 19 flex: 1; | 21 flex: 1; |
| 20 padding-top: var(--first-card-padding-top); | 22 padding-top: var(--first-card-padding-top); |
| 21 } | 23 } |
| 22 | 24 |
| 25 #loading-spinner { | |
| 26 bottom: 15px; | |
| 27 left: 0; | |
| 28 margin: 0 auto; | |
| 29 position: absolute; | |
| 30 right: 0; | |
| 31 width: 28px; | |
| 32 } | |
| 33 | |
| 23 paper-item { | 34 paper-item { |
| 24 -webkit-user-select: none; | 35 -webkit-user-select: none; |
| 25 cursor: pointer; | 36 cursor: pointer; |
| 26 font: inherit; | 37 font: inherit; |
| 27 } | 38 } |
| 28 | 39 |
| 29 paper-item:hover { | 40 paper-item:hover { |
| 30 background: #eaeaea; | 41 background: #eaeaea; |
| 31 } | 42 } |
| 32 </style> | 43 </style> |
| 33 <div id="no-results" class="centered-message" | 44 <div id="no-results" class="centered-message" |
| 34 hidden$="{{hasResults(historyData.length)}}"> | 45 hidden$="{{hasResults(historyData.length)}}"> |
| 35 {{noResultsMessage_(searchTerm, loading_)}} | 46 {{noResultsMessage_(searchTerm, loading_)}} |
| 36 </div> | 47 </div> |
| 37 <iron-list items="{{historyData}}" as="item" id="infinite-list" | 48 <iron-list items="{{historyData}}" as="item" id="infinite-list" |
| 38 on-scroll="scrollHandler_" | 49 on-scroll="scrollHandler_" |
| 39 hidden$="{{!hasResults(historyData.length)}}"> | 50 hidden$="{{!hasResults(historyData.length)}}"> |
| 40 <template> | 51 <template> |
| 41 <history-item item="[[item]]" | 52 <history-item item="[[item]]" |
| 42 starred="[[item.starred]]" | 53 starred="[[item.starred]]" |
| 43 selected="{{item.selected}}" | 54 selected="{{item.selected}}" |
| 44 is-card-start="[[isCardStart_(item, index, historyData.length)]]" | 55 is-card-start="[[isCardStart_(item, index, historyData.length)]]" |
| 45 is-card-end="[[isCardEnd_(item, index, historyData.length)]]" | 56 is-card-end="[[isCardEnd_(item, index, historyData.length)]]" |
| 46 has-time-gap="[[needsTimeGap_(item, index, historyData.length)]]" | 57 has-time-gap="[[needsTimeGap_(item, index, historyData.length)]]" |
| 47 search-term="[[searchTerm]]" | 58 search-term="[[searchTerm]]" |
| 48 number-of-items="[[historyData.length]]"> | 59 number-of-items="[[historyData.length]]"> |
| 49 </history-item> | 60 </history-item> |
| 50 </template> | 61 </template> |
| 51 </iron-list> | 62 </iron-list> |
| 63 <div id="loading-spinner" hidden$="[[!loading_]]"> | |
| 64 <paper-spinner alt=$i18n{loading} active></paper-spinner> | |
|
tsergeant
2016/04/18 01:26:36
Nit: This should have quotes
alt="$i18n{loading}"
lshang
2016/04/22 01:25:03
Done.
| |
| 65 </div> | |
| 52 <cr-shared-menu id="sharedMenu"> | 66 <cr-shared-menu id="sharedMenu"> |
| 53 <paper-item id="menuMoreButton" on-tap="onMoreFromSiteTap_"> | 67 <paper-item id="menuMoreButton" on-tap="onMoreFromSiteTap_"> |
| 54 $i18n{moreFromSite} | 68 $i18n{moreFromSite} |
| 55 </paper-item> | 69 </paper-item> |
| 56 <paper-item id="menuRemoveButton" on-tap="onRemoveFromHistoryTap_"> | 70 <paper-item id="menuRemoveButton" on-tap="onRemoveFromHistoryTap_"> |
| 57 $i18n{removeFromHistory} | 71 $i18n{removeFromHistory} |
| 58 </paper-item> | 72 </paper-item> |
| 59 </cr-shared-menu> | 73 </cr-shared-menu> |
| 60 </template> | 74 </template> |
| 61 <script src="chrome://history/history_list.js"></script> | 75 <script src="chrome://history/history_list.js"></script> |
| 62 </dom-module> | 76 </dom-module> |
| OLD | NEW |