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; |
| 16 } | 17 } |
| 17 | 18 |
| 18 #infinite-list { | 19 #infinite-list { |
| 19 flex: 1; | 20 flex: 1; |
| 20 padding-top: var(--first-card-padding-top); | 21 padding-top: var(--first-card-padding-top); |
| 21 } | 22 } |
| 22 | 23 |
| 24 #loading-spinner { | |
| 25 bottom: 15px; | |
| 26 left: 200px; | |
|
tsergeant
2016/04/15 05:14:50
This 200px is good when the sidebar exists, but wh
lshang
2016/04/18 00:29:00
Done.
An absolute position element is positioned r
tsergeant
2016/04/18 01:26:36
Yup, it's pretty weird sometimes.
| |
| 27 margin: 0 auto; | |
| 28 position: absolute; | |
| 29 right: 0; | |
| 30 width: 28px; | |
| 31 } | |
| 32 | |
| 23 paper-item { | 33 paper-item { |
| 24 -webkit-user-select: none; | 34 -webkit-user-select: none; |
| 25 cursor: pointer; | 35 cursor: pointer; |
| 26 font: inherit; | 36 font: inherit; |
| 27 } | 37 } |
| 28 | 38 |
| 29 paper-item:hover { | 39 paper-item:hover { |
| 30 background: #eaeaea; | 40 background: #eaeaea; |
| 31 } | 41 } |
| 32 </style> | 42 </style> |
| 33 <div id="no-results" class="centered-message" | 43 <div id="no-results" class="centered-message" |
| 34 hidden$="{{hasResults(historyData.length)}}"> | 44 hidden$="{{hasResults(historyData.length)}}"> |
| 35 {{noResultsMessage_(searchTerm, loading_)}} | 45 {{noResultsMessage_(searchTerm, loading_)}} |
| 36 </div> | 46 </div> |
| 37 <iron-list items="{{historyData}}" as="item" id="infinite-list" | 47 <iron-list items="{{historyData}}" as="item" id="infinite-list" |
| 38 on-scroll="scrollHandler_" | 48 on-scroll="scrollHandler_" |
| 39 hidden$="{{!hasResults(historyData.length)}}"> | 49 hidden$="{{!hasResults(historyData.length)}}"> |
| 40 <template> | 50 <template> |
| 41 <history-item item="[[item]]" | 51 <history-item item="[[item]]" |
| 42 starred="[[item.starred]]" | 52 starred="[[item.starred]]" |
| 43 selected="{{item.selected}}" | 53 selected="{{item.selected}}" |
| 44 is-card-start="[[item.isFirstItem]]" | 54 is-card-start="[[item.isFirstItem]]" |
| 45 is-card-end="[[item.isLastItem]]" | 55 is-card-end="[[item.isLastItem]]" |
| 46 search-term="[[searchTerm]]" | 56 search-term="[[searchTerm]]" |
| 47 number-of-items="[[historyData.length]]"> | 57 number-of-items="[[historyData.length]]"> |
| 48 </history-item> | 58 </history-item> |
| 49 </template> | 59 </template> |
| 50 </iron-list> | 60 </iron-list> |
| 61 <div id="loading-spinner" hidden$="[[!loading_]]"> | |
| 62 <paper-spinner alt="Loading more history" active></paper-spinner> | |
|
tsergeant
2016/04/15 05:14:50
The "Loading more history" string needs to be loca
lshang
2016/04/18 00:28:59
Done.
| |
| 63 </div> | |
| 51 <cr-shared-menu id="sharedMenu"> | 64 <cr-shared-menu id="sharedMenu"> |
| 52 <paper-item id="menuMoreButton" on-tap="onMoreFromSiteTap_"> | 65 <paper-item id="menuMoreButton" on-tap="onMoreFromSiteTap_"> |
| 53 $i18n{moreFromSite} | 66 $i18n{moreFromSite} |
| 54 </paper-item> | 67 </paper-item> |
| 55 <paper-item id="menuRemoveButton" on-tap="onRemoveFromHistoryTap_"> | 68 <paper-item id="menuRemoveButton" on-tap="onRemoveFromHistoryTap_"> |
| 56 $i18n{removeFromHistory} | 69 $i18n{removeFromHistory} |
| 57 </paper-item> | 70 </paper-item> |
| 58 </cr-shared-menu> | 71 </cr-shared-menu> |
| 59 </template> | 72 </template> |
| 60 <script src="chrome://history/history_list.js"></script> | 73 <script src="chrome://history/history_list.js"></script> |
| 61 </dom-module> | 74 </dom-module> |
| OLD | NEW |