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 { | |
|
tsergeant
2016/04/07 01:07:02
We generally use '#loading-spinner' rather than '#
lshang
2016/04/15 03:31:54
Done.
| |
| 25 bottom: 15px; | |
| 26 left: 50%; | |
|
tsergeant
2016/04/07 01:07:02
This will be ~not quite~ centered. This is because
lshang
2016/04/15 03:31:54
Done.
And I think it might look better if the spi
| |
| 27 position: absolute; | |
| 28 } | |
| 29 | |
| 30 #searching_spinner { | |
| 31 padding-right: 200px; | |
| 32 position: absolute; | |
| 33 right: 0; | |
| 34 top: 15px; | |
| 35 } | |
| 36 | |
| 37 paper-spinner.search { | |
| 38 height: 20px; | |
| 39 width: 20px; | |
| 40 } | |
| 41 | |
| 23 paper-item { | 42 paper-item { |
| 24 -webkit-user-select: none; | 43 -webkit-user-select: none; |
| 25 cursor: pointer; | 44 cursor: pointer; |
| 26 font: inherit; | 45 font: inherit; |
| 27 } | 46 } |
| 28 | 47 |
| 29 paper-item:hover { | 48 paper-item:hover { |
| 30 background: #eaeaea; | 49 background: #eaeaea; |
| 31 } | 50 } |
| 32 </style> | 51 </style> |
| 33 <div id="no-results" class="centered-message" | 52 <div id="no-results" class="centered-message" |
| 34 hidden$="{{hasResults(historyData.length)}}"> | 53 hidden$="{{hasResults(historyData.length)}}"> |
| 35 {{noResultsMessage_(searchTerm, loading_)}} | 54 {{noResultsMessage_(searchTerm, loading_)}} |
| 36 </div> | 55 </div> |
| 37 <iron-list items="{{historyData}}" as="item" id="infinite-list" | 56 <iron-list items="{{historyData}}" as="item" id="infinite-list" |
| 38 on-scroll="scrollHandler_" | 57 on-scroll="scrollHandler_" |
| 39 hidden$="{{!hasResults(historyData.length)}}"> | 58 hidden$="{{!hasResults(historyData.length)}}"> |
| 40 <template> | 59 <template> |
| 41 <history-item item="[[item]]" | 60 <history-item item="[[item]]" |
| 42 starred="[[item.starred]]" | 61 starred="[[item.starred]]" |
| 43 selected="{{item.selected}}" | 62 selected="{{item.selected}}" |
| 44 is-card-start="[[item.isFirstItem]]" | 63 is-card-start="[[item.isFirstItem]]" |
| 45 is-card-end="[[item.isLastItem]]" | 64 is-card-end="[[item.isLastItem]]" |
| 46 search-term="[[searchTerm]]" | 65 search-term="[[searchTerm]]" |
| 47 number-of-items="[[historyData.length]]"> | 66 number-of-items="[[historyData.length]]"> |
| 48 </history-item> | 67 </history-item> |
| 49 </template> | 68 </template> |
| 50 </iron-list> | 69 </iron-list> |
| 70 <div id="loading_spinner" hidden$="[[!loading_]]"> | |
| 71 <paper-spinner alt="Loading more history" active></paper-spinner> | |
| 72 </div> | |
| 73 <div id="searching_spinner" hidden$="[[!searching_]]"> | |
|
tsergeant
2016/04/07 01:07:02
It would be nice if this was part of the <history-
lshang
2016/04/15 03:31:54
Done.
| |
| 74 <paper-spinner class="search" alt="searching in history" active></paper-sp inner> | |
| 75 </div> | |
| 51 <cr-shared-menu id="sharedMenu"> | 76 <cr-shared-menu id="sharedMenu"> |
| 52 <paper-item on-tap="onMoreFromSiteTap_"> | 77 <paper-item on-tap="onMoreFromSiteTap_"> |
| 53 $i18n{moreFromSite} | 78 $i18n{moreFromSite} |
| 54 </paper-item> | 79 </paper-item> |
| 55 <paper-item on-tap="onRemoveFromHistoryTap_"> | 80 <paper-item on-tap="onRemoveFromHistoryTap_"> |
| 56 $i18n{removeFromHistory} | 81 $i18n{removeFromHistory} |
| 57 </paper-item> | 82 </paper-item> |
| 58 </cr-shared-menu> | 83 </cr-shared-menu> |
| 59 </template> | 84 </template> |
| 60 <script src="chrome://history/history_list.js"></script> | 85 <script src="chrome://history/history_list.js"></script> |
| 61 </dom-module> | 86 </dom-module> |
| OLD | NEW |