Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/assert.html"> | 2 <link rel="import" href="chrome://resources/html/assert.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> |
| 8 <link rel="import" href="/icons.html"> | 8 <link rel="import" href="/icons.html"> |
| 9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 <div data-path="/onStartup" on-tap="openPage_" | 131 <div data-path="/onStartup" on-tap="openPage_" |
| 132 hidden="[[!pageVisibility.onStartup]]"> | 132 hidden="[[!pageVisibility.onStartup]]"> |
| 133 <iron-icon icon="settings:power-settings-new"></iron-icon> | 133 <iron-icon icon="settings:power-settings-new"></iron-icon> |
| 134 $i18n{onStartup} | 134 $i18n{onStartup} |
| 135 </div> | 135 </div> |
| 136 </paper-menu> | 136 </paper-menu> |
| 137 </div> | 137 </div> |
| 138 <paper-submenu class="page-menu" id="advancedPage" actionable | 138 <paper-submenu class="page-menu" id="advancedPage" actionable |
| 139 opened="{{advancedOpened_}}" | 139 opened="{{advancedOpened_}}" |
| 140 hidden="[[!pageVisibility.advancedSettings]]"> | 140 hidden="[[!pageVisibility.advancedSettings]]"> |
| 141 <div class="menu-trigger" on-tap="ripple_"> | 141 <div class="menu-trigger" on-mousedown="ripple_"> |
|
Dan Beam
2016/09/15 01:11:09
does this work with touchstart or keydown?
dschuyler
2016/09/16 21:15:18
How about I just use a paper-ripple :)
| |
| 142 <span>$i18n{advancedPageTitle}</span> | 142 <span>$i18n{advancedPageTitle}</span> |
| 143 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> | 143 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> |
| 144 </div> | 144 </div> |
| 145 <paper-menu attr-for-selected="data-path" class="menu-content" | 145 <paper-menu attr-for-selected="data-path" class="menu-content" |
| 146 id="advancedMenu" selected="[[currentRoute.path]]"> | 146 id="advancedMenu" selected="[[currentRoute.path]]"> |
| 147 <if expr="chromeos"> | 147 <if expr="chromeos"> |
| 148 <div data-path="/dateTime" on-tap="openPage_"> | 148 <div data-path="/dateTime" on-tap="openPage_"> |
| 149 <iron-icon icon="settings:access-time"></iron-icon> | 149 <iron-icon icon="settings:access-time"></iron-icon> |
| 150 $i18n{dateTimePageTitle} | 150 $i18n{dateTimePageTitle} |
| 151 </div> | 151 </div> |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 198 <paper-submenu class="page-menu"> | 198 <paper-submenu class="page-menu"> |
| 199 <div about-selected$="[[aboutSelected_]]" class="menu-trigger" | 199 <div about-selected$="[[aboutSelected_]]" class="menu-trigger" |
| 200 id="about-menu" on-tap="openPage_" data-path="/help"> | 200 id="about-menu" on-tap="openPage_" data-path="/help"> |
| 201 $i18n{aboutPageTitle} | 201 $i18n{aboutPageTitle} |
| 202 </div> | 202 </div> |
| 203 </paper-submenu> | 203 </paper-submenu> |
| 204 </paper-menu> | 204 </paper-menu> |
| 205 </template> | 205 </template> |
| 206 <script src="settings_menu.js"></script> | 206 <script src="settings_menu.js"></script> |
| 207 </dom-module> | 207 </dom-module> |
| OLD | NEW |