Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/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/paper-button/paper-butt on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| 6 | 6 |
| 7 <dom-module id="bluetooth-settings"> | 7 <dom-module id="bluetooth-settings"> |
| 8 <link rel="import" type="css" href="bluetooth_settings.css"> | 8 <link rel="import" type="css" href="bluetooth_settings.css"> |
| 9 <template> | 9 <template> |
| 10 <div class="layout vertical"> | 10 <div class="layout vertical"> |
| 11 <div class="element-label">{{title}}</div> | 11 <div class="element-label">{{title}}</div> |
| 12 <form id="bluetooth-settings-form"> | 12 <form id="bluetooth-settings-form"> |
| 13 <div class="layout vertical"> | 13 <div class="layout vertical"> |
| 14 <p> | 14 <span class="form-label">Devices</span> |
| 15 <label> | 15 <template is="dom-repeat" items="{{devices}}"> |
|
stevenjb
2015/07/31 16:49:33
nit: [[devices]] since presumably the template isn
rfrappier
2015/07/31 19:52:05
Done.
| |
| 16 <span class="form-label">Toggle bluetooth</span> | 16 <div class="device-container"> |
| 17 <paper-toggle-button | 17 <div class="bluetooth-device"> |
| 18 checked="{{powerToMainAdapter}}"></paper-toggle-button> | 18 <div class="element-label">[[item.alias]]</div> |
| 19 </label> | 19 <paper-input value="{{item.alias}}" |
| 20 </p> | 20 label="Alias"></paper-input> |
| 21 </div> | 21 <paper-input value="{{item.path}}" |
| 22 <div class="layout vertical"> | 22 label="Path"></paper-input> |
| 23 <p> | 23 <paper-input value="{{item.address}}" |
| 24 <label> | 24 label="Address"></paper-input> |
| 25 <span class="form-label">Devices</span> | 25 <paper-input value="{{item.name}}" |
| 26 <template is="dom-repeat" items="{{devices}}"> | 26 label="name"></paper-input> |
| 27 <div class="device-container"> | 27 <span class="toggle-button-label">Trusted</span> |
| 28 <div class="bluetooth-device"> | 28 <paper-toggle-button |
| 29 <div class="element-label">[[item.name]]</div> | 29 checked="{{item.isTrusted}}"></paper-toggle-button> |
| 30 <paper-input value="{{item.name}}" | 30 <div class="device-field"> |
| 31 label="Name"></paper-input> | 31 <label> |
| 32 <paper-input value="{{item.path}}" | 32 <span class="form-label">Class/Type</span> |
| 33 label="Path"></paper-input> | 33 <paper-radio-group selected="{{item.class}}"> |
| 34 <paper-input value="{{item.address}}" | 34 <template is="dom-repeat" |
| 35 label="Address"></paper-input> | 35 items="{{deviceClassOptions}}" as="option" |
|
stevenjb
2015/07/31 16:49:33
nit: [[deviceClassOptions]]
rfrappier
2015/07/31 19:52:05
Done.
| |
| 36 <paper-input value="{{item.alias}}" | 36 index-as="option_index"> |
| 37 label="Alias"></paper-input> | 37 <paper-radio-button name="{{option.text}}" |
| 38 <span class="toggle-button-label">Trusted</span> | 38 >{{option.text}}</paper-radio-button> |
|
stevenjb
2015/07/31 16:49:33
nit: [[option.text]] (and below - anywhere the bin
rfrappier
2015/07/31 19:52:05
Done.
| |
| 39 <paper-toggle-button | 39 </template> |
| 40 checked="{{item.isTrusted}}"></paper-toggle-button> | 40 </paper-radio-group> |
| 41 <span class="toggle-button-label">Pairable</span> | 41 </label> |
| 42 <paper-toggle-button | 42 </div> |
| 43 checked="{{item.isPairable}}"></paper-toggle-button> | 43 <div class="device-field"> |
| 44 <div class="device-field"> | 44 <label> |
| 45 <p> | 45 <span class="form-label">Pair Authentication Type</span> |
| 46 <label> | 46 <paper-radio-group selected="{{item.pairingMethod}}"> |
| 47 <span class="form-label">Class/Type</span> | 47 <template is="dom-repeat" |
| 48 <paper-radio-group selected="{{item.class}}"> | 48 items="{{deviceAuthenticationMethods}}" as="method" |
| 49 <template is="dom-repeat" | 49 index-as="method_index"> |
| 50 items="{{deviceClassOptions}}" as="option" | 50 <paper-radio-button name="{{method}}" |
| 51 index-as="option_index"> | 51 >{{method}}</paper-radio-button> |
| 52 <paper-radio-button name="{{option.text}}" | 52 </template> |
| 53 >{{option.text}}</paper-radio-button> | 53 </paper-radio-group> |
| 54 </template> | 54 </label> |
| 55 </paper-radio-group> | 55 </div> |
| 56 </label> | 56 <template is="dom-if" |
| 57 </p> | 57 if="{{ showAuthToken(item.pairingMethod) }}"> |
|
stevenjb
2015/07/31 16:49:33
nit: no ' ' after {{ or before }}
rfrappier
2015/07/31 19:52:05
Done.
| |
| 58 </div> | 58 <div class="device-field"> |
| 59 <div class="device-field"> | 59 <paper-input value="{{item.pairingAuthToken}}" |
| 60 <p> | 60 label="Code"></paper-input> |
| 61 <label> | |
| 62 <span class="form-label">Pair Authentication Type</spa n> | |
| 63 <paper-radio-group selected="{{item.pairMethod}}"> | |
| 64 <template is="dom-repeat" | |
| 65 items="{{deviceAuthenticationMethods}}" as="meth od" | |
| 66 index-as="method_index"> | |
| 67 <paper-radio-button name="{{method}}" | |
| 68 >{{method}}</paper-radio-button> | |
| 69 </template> | |
| 70 </paper-radio-group> | |
| 71 </label> | |
| 72 </p> | |
| 73 </div> | |
| 74 <paper-button raised class="colored" on-click="pairDevice" | |
| 75 data-index="[[index]]"> | |
| 76 Pair | |
| 77 </paper-button> | |
| 78 <paper-button raised class="colored" | |
| 79 on-click="discoverDevice" data-index="[[index]]"> | |
| 80 Make Discoverable | |
| 81 </paper-button> | |
| 82 </div> | 61 </div> |
| 83 </div> | 62 </template> |
| 84 </template> | 63 <paper-button raised class="colored" on-click="pairDevice" |
| 85 <paper-button on-click="appendNewDevice"> | 64 data-index="[[index]]"> |
| 86 [+] New Device | 65 Pair |
| 87 </paper-button> | 66 </paper-button> |
| 88 </label> | 67 <paper-button raised class="colored" |
| 89 </p> | 68 on-click="discoverDevice" data-index="[[index]]"> |
| 69 Make Discoverable | |
| 70 </paper-button> | |
| 71 </div> | |
| 72 </div> | |
| 73 </template> | |
| 74 <paper-button on-click="appendNewDevice"> | |
| 75 [+] New Device | |
| 76 </paper-button> | |
| 90 </div> | 77 </div> |
| 91 </form> | 78 </form> |
| 92 </div> | 79 </div> |
| 93 </template> | 80 </template> |
| 94 <script src="bluetooth_settings.js"></script> | 81 <script src="bluetooth_settings.js"></script> |
| 95 </dom-module> | 82 </dom-module> |
| OLD | NEW |