Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.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/html/icon.html"> | 4 <link rel="import" href="chrome://resources/html/icon.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 6 <link rel="import" href="/controls/extension_controlled_indicator.html"> | |
| 6 <link rel="import" href="/search_engines_page/search_engine_dialog.html"> | 7 <link rel="import" href="/search_engines_page/search_engine_dialog.html"> |
| 7 <link rel="import" href="/search_engines_page/search_engine_entry_css.html"> | 8 <link rel="import" href="/search_engines_page/search_engine_entry_css.html"> |
| 8 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" > | 9 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" > |
| 9 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| 10 | 11 |
| 11 <dom-module id="settings-search-engine-entry"> | 12 <dom-module id="settings-search-engine-entry"> |
| 12 <template> | 13 <template> |
| 13 <style include="settings-shared search-engine-entry"> | 14 <style include="settings-shared search-engine-entry"> |
| 14 :host([is-default]) { | 15 :host([is-default]) .list-item { |
| 15 font-weight: 500; | 16 font-weight: 500; |
| 16 } | 17 } |
| 17 | 18 |
| 18 .name-column, | 19 .name-column, |
| 19 .keyword-column { | 20 .keyword-column { |
| 20 flex: 3; | 21 flex: 3; |
| 21 } | 22 } |
| 22 | 23 |
| 23 .url-column { | 24 .url-column { |
| 24 flex: 4; | 25 flex: 4; |
| 25 overflow: hidden; | 26 overflow: hidden; |
| 26 text-overflow: ellipsis; | 27 text-overflow: ellipsis; |
| 27 white-space: nowrap; | 28 white-space: nowrap; |
| 28 } | 29 } |
| 30 | |
| 31 :host(:not([show-dots_])) paper-icon-button { | |
| 32 pointer-events: none; | |
| 33 visibility: hidden; | |
| 34 } | |
| 29 </style> | 35 </style> |
| 30 | 36 |
| 31 <template is="dom-if" if="[[showEditSearchEngineDialog_]]" restamp> | 37 <template is="dom-if" if="[[showEditSearchEngineDialog_]]" restamp> |
| 32 <settings-search-engine-dialog model="[[engine]]"> | 38 <settings-search-engine-dialog model="[[engine]]"> |
| 33 </settings-search-engine-dialog> | 39 </settings-search-engine-dialog> |
| 34 </template> | 40 </template> |
| 35 <div class="list-item"> | 41 <div class="list-item"> |
| 36 <div class="name-column"> | 42 <div class="name-column"> |
| 37 <span class="favicon-image" | 43 <span class="favicon-image" |
| 38 style="background-image: [[getIconSet_(engine.iconURL)]]"></span> | 44 style="background-image: [[getIconSet_(engine.iconURL)]]"></span> |
| 39 <span class="name">[[engine.displayName]]</span> | 45 <span class="name">[[engine.displayName]]</span> |
| 40 </div> | 46 </div> |
| 41 <div class="keyword-column">[[engine.keyword]]</div> | 47 <div class="keyword-column">[[engine.keyword]]</div> |
| 42 <div class="url-column">[[engine.url]]</div> | 48 <div class="url-column">[[engine.url]]</div> |
| 43 <paper-icon-button icon="cr:more-vert" tabindex$="[[tabindex]]" | 49 <paper-icon-button icon="cr:more-vert" tabindex$="[[tabindex]]" |
| 44 on-tap="onDotsTap_"> | 50 on-tap="onDotsTap_"> |
| 45 </paper-icon-button> | 51 </paper-icon-button> |
| 46 <dialog is="cr-action-menu"> | 52 <template is="dom-if" if="[[showDots_]]"> |
|
dpapad
2016/11/23 19:59:54
Perhaps add a test for this?
Dan Beam
2016/12/01 06:21:52
well, I removed the dom-if for a few reasons.
a)
| |
| 47 <button class="dropdown-item" role="option" on-tap="onMakeDefaultTap_" | 53 <dialog is="cr-action-menu"> |
| 48 hidden$="[[!engine.canBeDefault]]" id="makeDefault"> | 54 <button class="dropdown-item" role="option" on-tap="onMakeDefaultTap_" |
| 49 $i18n{searchEnginesMakeDefault} | 55 hidden$="[[!engine.canBeDefault]]" id="makeDefault"> |
| 50 </button> | 56 $i18n{searchEnginesMakeDefault} |
| 51 <button class="dropdown-item" role="option" on-tap="onEditTap_" | 57 </button> |
| 52 hidden$="[[!engine.canBeEdited]]" | 58 <button class="dropdown-item" role="option" on-tap="onEditTap_" |
| 53 id="edit">$i18n{searchEnginesEdit}</button> | 59 hidden$="[[!engine.canBeEdited]]" |
| 54 <button class="dropdown-item" role="option" on-tap="onDeleteTap_" | 60 id="edit">$i18n{searchEnginesEdit}</button> |
| 55 hidden$="[[!engine.canBeRemoved]]" | 61 <button class="dropdown-item" role="option" on-tap="onDeleteTap_" |
| 56 id="delete">$i18n{searchEnginesRemoveFromList}</button> | 62 hidden$="[[!engine.canBeRemoved]]" |
| 57 </dialog> | 63 id="delete">$i18n{searchEnginesRemoveFromList}</button> |
| 64 </dialog> | |
| 65 </template> | |
| 58 </div> | 66 </div> |
| 67 <template is="dom-if" if="[[engine.extension]]"> | |
| 68 <extension-controlled-indicator | |
| 69 extension-id="[[engine.extension.id]]" | |
| 70 extension-name="[[engine.extension.name]]" | |
| 71 extension-can-be-disabled="[[engine.extension.canBeDisabled]]"> | |
| 72 </extension-controlled-indicator> | |
| 73 </template> | |
| 59 </template> | 74 </template> |
| 60 <script src="search_engine_entry.js"></script> | 75 <script src="search_engine_entry.js"></script> |
| 61 </dom-module> | 76 </dom-module> |
| OLD | NEW |