OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 cr.define('options.internet', function() { | 5 cr.define('options.internet', function() { |
6 /** | 6 /** |
7 * Creates a new network list div. | 7 * Creates a new network list div. |
8 * @param {Object=} opt_propertyBag Optional properties. | 8 * @param {Object=} opt_propertyBag Optional properties. |
9 * @constructor | 9 * @constructor |
10 * @extends {HTMLDivElement} | 10 * @extends {HTMLDivElement} |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 if (item) { | 63 if (item) { |
64 var data = item.data; | 64 var data = item.data; |
65 // Don't try to connect to Ethernet or unactivated Cellular. | 65 // Don't try to connect to Ethernet or unactivated Cellular. |
66 if (data && (data.networkType == 1 || | 66 if (data && (data.networkType == 1 || |
67 (data.networkType == 5 && data.activation_state != 1))) | 67 (data.networkType == 5 && data.activation_state != 1))) |
68 return; | 68 return; |
69 for (var i = 0; i < this.childNodes.length; i++) { | 69 for (var i = 0; i < this.childNodes.length; i++) { |
70 if (this.childNodes[i] != item) | 70 if (this.childNodes[i] != item) |
71 this.childNodes[i].hidePassword(); | 71 this.childNodes[i].hidePassword(); |
72 } | 72 } |
| 73 InternetOptions.unlockUpdates(); |
73 // If clicked on other networks item. | 74 // If clicked on other networks item. |
74 if (data && data.servicePath == '?') { | 75 if (data && data.servicePath == '?') { |
75 item.showOtherLogin(); | 76 item.showOtherLogin(); |
76 } else if (data) { | 77 } else if (data) { |
77 if (!data.connecting && !data.connected) { | 78 if (!data.connecting && !data.connected) { |
78 chrome.send('buttonClickCallback', | 79 chrome.send('buttonClickCallback', |
79 [String(data.networkType), | 80 [String(data.networkType), |
80 data.servicePath, | 81 data.servicePath, |
81 'connect']); | 82 'connect']); |
82 } | 83 } |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 } | 248 } |
248 | 249 |
249 buttonsDiv.appendChild(button); | 250 buttonsDiv.appendChild(button); |
250 } | 251 } |
251 this.appendChild(buttonsDiv); | 252 this.appendChild(buttonsDiv); |
252 }, | 253 }, |
253 | 254 |
254 showPassword: function() { | 255 showPassword: function() { |
255 if (this.connecting) | 256 if (this.connecting) |
256 return; | 257 return; |
| 258 |
| 259 InternetOptions.lockUpdates(); |
| 260 |
257 var passwordDiv = this.ownerDocument.createElement('div'); | 261 var passwordDiv = this.ownerDocument.createElement('div'); |
258 passwordDiv.className = 'network-password'; | 262 passwordDiv.className = 'network-password'; |
259 var passInput = this.ownerDocument.createElement('input'); | 263 var passInput = this.ownerDocument.createElement('input'); |
260 passwordDiv.appendChild(passInput); | 264 passwordDiv.appendChild(passInput); |
261 passInput.placeholder = localStrings.getString('inetPassPrompt'); | 265 passInput.placeholder = localStrings.getString('inetPassPrompt'); |
262 passInput.type = 'password'; | 266 passInput.type = 'password'; |
263 var buttonEl = this.ownerDocument.createElement('button'); | 267 var buttonEl = this.ownerDocument.createElement('button'); |
264 buttonEl.textContent = localStrings.getString('inetLogin'); | 268 buttonEl.textContent = localStrings.getString('inetLogin'); |
265 buttonEl.addEventListener('click', this.handleLogin_); | 269 buttonEl.addEventListener('click', this.handleLogin_); |
266 buttonEl.servicePath = this.data.servicePath; | 270 buttonEl.servicePath = this.data.servicePath; |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 if (children[i].className == 'network-password') { | 314 if (children[i].className == 'network-password') { |
311 this.removeChild(children[i]); | 315 this.removeChild(children[i]); |
312 } | 316 } |
313 } | 317 } |
314 }, | 318 }, |
315 | 319 |
316 showOtherLogin: function() { | 320 showOtherLogin: function() { |
317 if (this.connecting) | 321 if (this.connecting) |
318 return; | 322 return; |
319 | 323 |
| 324 InternetOptions.lockUpdates(); |
| 325 |
320 var ssidDiv = this.ownerDocument.createElement('div'); | 326 var ssidDiv = this.ownerDocument.createElement('div'); |
321 ssidDiv.className = 'network-password'; | 327 ssidDiv.className = 'network-password'; |
322 var ssidInput = this.ownerDocument.createElement('input'); | 328 var ssidInput = this.ownerDocument.createElement('input'); |
323 ssidInput.placeholder = localStrings.getString('inetSsidPrompt'); | 329 ssidInput.placeholder = localStrings.getString('inetSsidPrompt'); |
324 ssidDiv.appendChild(ssidInput); | 330 ssidDiv.appendChild(ssidInput); |
325 | 331 |
326 var securityDiv = this.ownerDocument.createElement('div'); | 332 var securityDiv = this.ownerDocument.createElement('div'); |
327 securityDiv.className = 'network-password'; | 333 securityDiv.className = 'network-password'; |
328 var securityInput = this.ownerDocument.createElement('select'); | 334 var securityInput = this.ownerDocument.createElement('select'); |
329 var securityNoneOption = this.ownerDocument.createElement('option'); | 335 var securityNoneOption = this.ownerDocument.createElement('option'); |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 * Whether the underlying network is an other network for adding networks. | 463 * Whether the underlying network is an other network for adding networks. |
458 * Only used for display purpose. | 464 * Only used for display purpose. |
459 * @type {boolean} | 465 * @type {boolean} |
460 */ | 466 */ |
461 cr.defineProperty(NetworkItem, 'other', cr.PropertyKind.BOOL_ATTR); | 467 cr.defineProperty(NetworkItem, 'other', cr.PropertyKind.BOOL_ATTR); |
462 | 468 |
463 return { | 469 return { |
464 NetworkElement: NetworkElement | 470 NetworkElement: NetworkElement |
465 }; | 471 }; |
466 }); | 472 }); |
OLD | NEW |