Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> |
| 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.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-flex-layout/classe s/iron-flex-layout.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| 8 <link rel="import" href="../i18n_setup.html"> | 8 <link rel="import" href="../i18n_setup.html"> |
| 9 <link rel="import" href="../icons.html"> | 9 <link rel="import" href="../icons.html"> |
| 10 <link rel="import" href="../settings_shared_css.html"> | 10 <link rel="import" href="../settings_shared_css.html"> |
| 11 <link rel="import" href="bluetooth_device_dialog.html"> | 11 <link rel="import" href="bluetooth_device_dialog.html"> |
| 12 <link rel="import" href="bluetooth_device_list_item.html"> | 12 <link rel="import" href="bluetooth_device_list_item.html"> |
| 13 | 13 |
| 14 <dom-module id="settings-bluetooth-subpage"> | 14 <dom-module id="settings-bluetooth-subpage"> |
| 15 <template> | 15 <template> |
| 16 <style include="settings-shared"> | 16 <style include="settings-shared iron-flex"> |
| 17 .container { | 17 .container { |
| 18 @apply(--settings-list-frame-padding); | 18 @apply(--settings-list-frame-padding); |
| 19 min-height: 10px; | 19 min-height: 10px; |
| 20 overflow-y: auto; | 20 overflow-y: auto; |
|
stevenjb
2017/05/01 19:07:30
display: flex;
flex-direction: column;
dpapad
2017/05/01 19:38:43
Done.
| |
| 21 } | 21 } |
| 22 | 22 |
| 23 .header { | 23 .header { |
| 24 margin-top: 10px; | 24 margin-top: 10px; |
| 25 } | 25 } |
| 26 | 26 |
| 27 paper-spinner { | 27 paper-spinner { |
| 28 @apply(--cr-icon-height-width); | 28 @apply(--cr-icon-height-width); |
| 29 } | 29 } |
| 30 | 30 |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 46 </div> | 46 </div> |
| 47 | 47 |
| 48 <!-- Paired device list --> | 48 <!-- Paired device list --> |
| 49 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]"> | 49 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]"> |
| 50 <div class="start">$i18n{bluetoothDeviceListPaired}</div> | 50 <div class="start">$i18n{bluetoothDeviceListPaired}</div> |
| 51 </div> | 51 </div> |
| 52 <div id="noPairedDevices" class="list-frame" | 52 <div id="noPairedDevices" class="list-frame" |
| 53 hidden="[[!showNoDevices_(bluetoothToggleState, pairedDeviceList_)]]"> | 53 hidden="[[!showNoDevices_(bluetoothToggleState, pairedDeviceList_)]]"> |
| 54 $i18n{bluetoothNoDevices} | 54 $i18n{bluetoothNoDevices} |
| 55 </div> | 55 </div> |
| 56 <div id="pairedContainer" class="container layout vertical" | 56 <div id="pairedContainer" class="container layout vertical" |
|
stevenjb
2017/05/01 19:07:30
Elim "layout vertical"
dpapad
2017/05/01 19:38:43
Done.
| |
| 57 scrollable on-device-event="onDeviceEvent_" | 57 scrollable on-device-event="onDeviceEvent_" |
| 58 hidden="[[!showDevices_(bluetoothToggleState, pairedDeviceList_)]]"> | 58 hidden="[[!showDevices_(bluetoothToggleState, pairedDeviceList_)]]"> |
| 59 <iron-list id="pairedDevices" class="vertical-list" | 59 <iron-list id="pairedDevices" class="vertical-list" |
| 60 items="[[pairedDeviceList_]]" | 60 items="[[pairedDeviceList_]]" |
| 61 selection-enabled selected-item="{{selectedPairedItem_}}" | 61 selection-enabled selected-item="{{selectedPairedItem_}}" |
| 62 scroll-target="pairedContainer"> | 62 scroll-target="pairedContainer"> |
| 63 <template> | 63 <template> |
| 64 <bluetooth-device-list-item device="[[item]]" | 64 <bluetooth-device-list-item device="[[item]]" |
| 65 tabindex$="[[tabIndex]]"> | 65 tabindex$="[[tabIndex]]"> |
| 66 </bluetooth-device-list-item> | 66 </bluetooth-device-list-item> |
| 67 </template> | 67 </template> |
| 68 </iron-list> | 68 </iron-list> |
| 69 </div> | 69 </div> |
| 70 | 70 |
| 71 <!-- Unpaired device list --> | 71 <!-- Unpaired device list --> |
| 72 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]"> | 72 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]"> |
| 73 <div class="start">$i18n{bluetoothDeviceListUnpaired}</div> | 73 <div class="start">$i18n{bluetoothDeviceListUnpaired}</div> |
| 74 <paper-spinner active="[[showSpinner_]]"> | 74 <paper-spinner active="[[showSpinner_]]"> |
| 75 </paper-spinner> | 75 </paper-spinner> |
| 76 </div> | 76 </div> |
| 77 <div id="noUnpairedDevices" class="list-frame" | 77 <div id="noUnpairedDevices" class="list-frame" |
| 78 hidden="[[!showNoDevices_(bluetoothToggleState, unpairedDeviceList_)]]"> | 78 hidden="[[!showNoDevices_(bluetoothToggleState, unpairedDeviceList_)]]"> |
| 79 $i18n{bluetoothNoDevicesFound} | 79 $i18n{bluetoothNoDevicesFound} |
| 80 </div> | 80 </div> |
| 81 <div id="unpairedContainer" class="container layout vertical" | 81 <div id="unpairedContainer" class="container layout vertical" |
|
stevenjb
2017/05/01 19:07:30
Elim "layout vertical"
| |
| 82 scrollable on-device-event="onDeviceEvent_" | 82 scrollable on-device-event="onDeviceEvent_" |
| 83 hidden="[[!showDevices_(bluetoothToggleState, unpairedDeviceList_)]]"> | 83 hidden="[[!showDevices_(bluetoothToggleState, unpairedDeviceList_)]]"> |
| 84 <iron-list id="unpairedDevices" class="vertical-list" | 84 <iron-list id="unpairedDevices" class="vertical-list" |
| 85 items="[[unpairedDeviceList_]]" | 85 items="[[unpairedDeviceList_]]" |
| 86 selection-enabled selected-item="{{selectedUnpairedItem_}}" | 86 selection-enabled selected-item="{{selectedUnpairedItem_}}" |
| 87 scroll-target="unpairedContainer"> | 87 scroll-target="unpairedContainer"> |
| 88 <template> | 88 <template> |
| 89 <bluetooth-device-list-item device="[[item]]" | 89 <bluetooth-device-list-item device="[[item]]" |
| 90 tabindex$="[[tabIndex]]"> | 90 tabindex$="[[tabIndex]]"> |
| 91 </bluetooth-device-list-item> | 91 </bluetooth-device-list-item> |
| 92 </template> | 92 </template> |
| 93 </iron-list> | 93 </iron-list> |
| 94 </div> | 94 </div> |
| 95 | 95 |
| 96 <bluetooth-device-dialog id="deviceDialog" | 96 <bluetooth-device-dialog id="deviceDialog" |
| 97 bluetooth-private="[[bluetoothPrivate]]" | 97 bluetooth-private="[[bluetoothPrivate]]" |
| 98 dialog-id="[[dialogId_]]" | 98 dialog-id="[[dialogId_]]" |
| 99 error-message="[[errorMessage_]]" | 99 error-message="[[errorMessage_]]" |
| 100 on-close="onDialogClose_" | 100 on-close="onDialogClose_" |
| 101 on-device-event="onDeviceEvent_" | 101 on-device-event="onDeviceEvent_" |
| 102 pairing-device="[[pairingDevice_]]"> | 102 pairing-device="[[pairingDevice_]]"> |
| 103 </bluetooth-device-dialog> | 103 </bluetooth-device-dialog> |
| 104 | 104 |
| 105 </template> | 105 </template> |
| 106 <script src="bluetooth_subpage.js"></script> | 106 <script src="bluetooth_subpage.js"></script> |
| 107 </dom-module> | 107 </dom-module> |
| OLD | NEW |