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-flex-layout/iron-f lex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> |
4 <link rel="import" href="chrome://history/grouped_list.html"> | 4 <link rel="import" href="chrome://history/grouped_list.html"> |
5 <link rel="import" href="chrome://history/history_list.html"> | 5 <link rel="import" href="chrome://history/history_list.html"> |
6 <link rel="import" href="chrome://history/history_toolbar.html"> | 6 <link rel="import" href="chrome://history/history_toolbar.html"> |
7 <link rel="import" href="chrome://history/synced_device_manager.html"> | 7 <link rel="import" href="chrome://history/synced_device_manager.html"> |
8 <link rel="import" href="chrome://history/side_bar.html"> | 8 <link rel="import" href="chrome://history/side_bar.html"> |
9 <link rel="import" href="chrome://history/shared_style.html"> | 9 <link rel="import" href="chrome://history/shared_style.html"> |
10 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location. html"> | |
tsergeant
2016/06/08 03:42:17
Nit: Sort imports
calamity
2016/06/14 05:05:50
Done.
| |
11 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.htm l"> | |
10 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 12 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
11 | 13 |
12 <dom-module id="history-app"> | 14 <dom-module id="history-app"> |
13 <!-- TODO(calamity): work around this deprecated import style --> | 15 <!-- TODO(calamity): work around this deprecated import style --> |
14 <template> | 16 <template> |
15 <style no-process> | 17 <style no-process> |
16 history-toolbar { | 18 history-toolbar { |
17 background: var(--md-toolbar-color); | 19 background: var(--md-toolbar-color); |
18 } | 20 } |
19 </style> | 21 </style> |
(...skipping 15 matching lines...) Expand all Loading... | |
35 history-grouped-list { | 37 history-grouped-list { |
36 flex: 1 0 0; | 38 flex: 1 0 0; |
37 } | 39 } |
38 | 40 |
39 #content { | 41 #content { |
40 display: flex; | 42 display: flex; |
41 flex: 1 0 0; | 43 flex: 1 0 0; |
42 overflow: hidden; | 44 overflow: hidden; |
43 } | 45 } |
44 </style> | 46 </style> |
47 | |
48 <app-location route="{{route}}"></app-location> | |
49 <app-route route="{{route}}" pattern="/:page" data="{{routeData}}"> | |
50 </app-route> | |
45 <history-toolbar id="toolbar" searching="[[queryState_.querying]]" | 51 <history-toolbar id="toolbar" searching="[[queryState_.querying]]" |
46 is-grouped-mode="{{grouped_}}" | 52 is-grouped-mode="{{grouped_}}" |
47 grouped-range="{{queryState_.range}}" | 53 grouped-range="{{queryState_.range}}" |
48 search-term="{{queryState_.searchTerm}}" | 54 search-term="{{queryState_.searchTerm}}" |
49 query-start-time="[[queryState_.info.queryStartTime]]" | 55 query-start-time="[[queryState_.info.queryStartTime]]" |
50 query-end-time="[[queryState_.info.queryEndTime]]"> | 56 query-end-time="[[queryState_.info.queryEndTime]]"> |
51 </history-toolbar> | 57 </history-toolbar> |
52 | 58 |
53 <div id="main-container"> | 59 <div id="main-container"> |
54 <history-side-bar id="history-side-bar" selected-page="{{selectedPage_}}"> | 60 <history-side-bar id="history-side-bar" selected-page="{{selectedPage}}" |
tsergeant
2016/06/08 03:42:17
The history-app property is called `selectedPage_`
calamity
2016/06/14 05:05:50
Done.
| |
61 route-data="{{routeData}}">` | |
tsergeant
2016/06/08 03:42:17
There's a sneaky ` character hiding out here.
calamity
2016/06/14 05:05:50
Done.
| |
55 </history-side-bar> | 62 </history-side-bar> |
56 <iron-pages id="content" attr-for-selected="id" | 63 <iron-pages id="content" attr-for-selected="id" |
57 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> | 64 selected="[[getSelectedPage(selectedPage_, queryState_.range)]]"> |
58 <history-list id="history-list" querying="[[queryState_.querying]]" | 65 <history-list id="history-list" querying="[[queryState_.querying]]" |
59 searched-term="[[queryState_.info.term]]"></history-list> | 66 searched-term="[[queryState_.info.term]]"></history-list> |
60 <template is="dom-if" if="[[grouped_]]"> | 67 <template is="dom-if" if="[[grouped_]]"> |
61 <history-grouped-list id="history-grouped-list" | 68 <history-grouped-list id="history-grouped-list" |
62 range="[[queryState_.range]]" | 69 range="[[queryState_.range]]" |
63 query-start-time="[[queryState_.info.queryStartTime]]" | 70 query-start-time="[[queryState_.info.queryStartTime]]" |
64 query-end-time="[[queryState_.info.queryEndTime]]" | 71 query-end-time="[[queryState_.info.queryEndTime]]" |
65 searched-term="[[queryState_.info.term]]"> | 72 searched-term="[[queryState_.info.term]]"> |
66 </history-grouped-list> | 73 </history-grouped-list> |
67 </template> | 74 </template> |
68 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 75 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
69 <history-synced-device-manager id="history-synced-device-manager" | 76 <history-synced-device-manager id="history-synced-device-manager" |
70 session-list="[[queryState_.sessionList]]" | 77 session-list="[[queryState_.sessionList]]" |
71 searched-term=[[queryState_.info.term]]> | 78 searched-term=[[queryState_.info.term]]> |
72 </history-synced-device-manager> | 79 </history-synced-device-manager> |
73 </template> | 80 </template> |
74 </iron-pages> | 81 </iron-pages> |
75 </div> | 82 </div> |
76 </template> | 83 </template> |
77 <script src="chrome://history/app.js"></script> | 84 <script src="chrome://history/app.js"></script> |
78 </dom-module> | 85 </dom-module> |
OLD | NEW |