Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Side by Side Diff: chrome/browser/resources/options/chromeos_internet_options.js

Issue 6679040: [cros] Add checkbox for toggling data roaming setting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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', function() { 5 cr.define('options', function() {
6 var OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 7
8 ///////////////////////////////////////////////////////////////////////////// 8 /////////////////////////////////////////////////////////////////////////////
9 // InternetOptions class: 9 // InternetOptions class:
10 10
(...skipping 17 matching lines...) Expand all
28 * Calls base class implementation to starts preference initialization. 28 * Calls base class implementation to starts preference initialization.
29 */ 29 */
30 initializePage: function() { 30 initializePage: function() {
31 OptionsPage.prototype.initializePage.call(this); 31 OptionsPage.prototype.initializePage.call(this);
32 32
33 if (templateData.accessLocked) { 33 if (templateData.accessLocked) {
34 var page = $('internetPage'); 34 var page = $('internetPage');
35 page.setAttribute('accesslocked', true); 35 page.setAttribute('accesslocked', true);
36 } 36 }
37 37
38 options.internet.NetworkElement.decorate($('wiredList')); 38 options.internet.NetworkElement.decorate($('wired-list'));
39 $('wiredList').load(templateData.wiredList); 39 $('wired-list').load(templateData.wiredList);
40 options.internet.NetworkElement.decorate($('wirelessList')); 40 options.internet.NetworkElement.decorate($('wireless-list'));
41 $('wirelessList').load(templateData.wirelessList); 41 $('wireless-list').load(templateData.wirelessList);
42 options.internet.NetworkElement.decorate($('rememberedList')); 42 options.internet.NetworkElement.decorate($('remembered-list'));
43 $('rememberedList').load(templateData.rememberedList); 43 $('remembered-list').load(templateData.rememberedList);
44 44
45 options.internet.CellularPlanElement.decorate($('planList')); 45 options.internet.CellularPlanElement.decorate($('planList'));
46 46
47 $('wiredSection').hidden = (templateData.wiredList.length == 0); 47 $('wired-section').hidden = (templateData.wiredList.length == 0);
48 $('wirelessSection').hidden = (templateData.wirelessList.length == 0); 48 $('wireless-section').hidden = (templateData.wirelessList.length == 0);
49 $('rememberedSection').hidden = (templateData.rememberedList.length == 0); 49 $('remembered-section').hidden =
50 (templateData.rememberedList.length == 0);
50 InternetOptions.setupAttributes(templateData); 51 InternetOptions.setupAttributes(templateData);
51 $('detailsInternetDismiss').addEventListener('click', function(event) { 52 $('detailsInternetDismiss').addEventListener('click', function(event) {
52 InternetOptions.setDetails(); 53 InternetOptions.setDetails();
53 }); 54 });
54 $('detailsInternetLogin').addEventListener('click', function(event) { 55 $('detailsInternetLogin').addEventListener('click', function(event) {
55 InternetOptions.loginFromDetails(); 56 InternetOptions.loginFromDetails();
56 }); 57 });
57 $('activateDetails').addEventListener('click', function(event) { 58 $('activateDetails').addEventListener('click', function(event) {
58 InternetOptions.activateFromDetails(); 59 InternetOptions.activateFromDetails();
59 }); 60 });
60 $('enableWifi').addEventListener('click', function(event) { 61 $('enable-wifi').addEventListener('click', function(event) {
61 event.target.disabled = true; 62 event.target.disabled = true;
62 chrome.send('enableWifi', []); 63 chrome.send('enableWifi', []);
63 }); 64 });
64 $('disableWifi').addEventListener('click', function(event) { 65 $('disable-wifi').addEventListener('click', function(event) {
65 event.target.disabled = true; 66 event.target.disabled = true;
66 chrome.send('disableWifi', []); 67 chrome.send('disableWifi', []);
67 }); 68 });
68 $('enableCellular').addEventListener('click', function(event) { 69 $('enable-cellular').addEventListener('click', function(event) {
69 event.target.disabled = true; 70 event.target.disabled = true;
70 chrome.send('enableCellular', []); 71 chrome.send('enableCellular', []);
71 }); 72 });
72 $('disableCellular').addEventListener('click', function(event) { 73 $('disable-cellular').addEventListener('click', function(event) {
73 event.target.disabled = true; 74 event.target.disabled = true;
74 chrome.send('disableCellular', []); 75 chrome.send('disableCellular', []);
75 }); 76 });
76 $('buyplanDetails').addEventListener('click', function(event) { 77 $('buyplanDetails').addEventListener('click', function(event) {
77 chrome.send('buyDataPlan', []); 78 chrome.send('buyDataPlan', []);
78 OptionsPage.closeOverlay(); 79 OptionsPage.closeOverlay();
79 }); 80 });
80 this.showNetworkDetails_(); 81 this.showNetworkDetails_();
81 }, 82 },
82 83
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 var servicePath = data.servicePath; 140 var servicePath = data.servicePath;
140 if (data.type == options.internet.Constants.TYPE_WIFI) { 141 if (data.type == options.internet.Constants.TYPE_WIFI) {
141 chrome.send('setDetails',[String(servicePath), 142 chrome.send('setDetails',[String(servicePath),
142 $('autoConnectNetwork').checked ? 143 $('autoConnectNetwork').checked ?
143 "true" : "false"]); 144 "true" : "false"]);
144 } 145 }
145 OptionsPage.closeOverlay(); 146 OptionsPage.closeOverlay();
146 }; 147 };
147 148
148 InternetOptions.setupAttributes = function(data) { 149 InternetOptions.setupAttributes = function(data) {
149 var buttons = $('wirelessButtons'); 150 var buttons = $('wireless-buttons');
150 if (data.wifiEnabled) { 151 if (data.wifiEnabled) {
151 $('disableWifi').disabled = false; 152 $('disable-wifi').disabled = false;
152 $('disableWifi').classList.remove('hidden'); 153 $('disable-wifi').hidden = false;
153 $('enableWifi').classList.add('hidden'); 154 $('enable-wifi').hidden = true;
154 } else { 155 } else {
155 $('enableWifi').disabled = false; 156 $('enable-wifi').disabled = false;
156 $('enableWifi').classList.remove('hidden'); 157 $('enable-wifi').hidden = false;
157 $('disableWifi').classList.add('hidden'); 158 $('disable-wifi').hidden = true;
158 } 159 }
159 if (data.cellularAvailable) { 160 if (data.cellularAvailable) {
160 if (data.cellularEnabled) { 161 if (data.cellularEnabled) {
161 $('disableCellular').disabled = false; 162 $('disable-cellular').disabled = false;
162 $('disableCellular').classList.remove('hidden'); 163 $('disable-cellular').hidden = false;
163 $('enableCellular').classList.add('hidden'); 164 $('enable-cellular').hidden = true;
164 } else { 165 } else {
165 $('enableCellular').disabled = false; 166 $('enable-cellular').disabled = false;
166 $('enableCellular').classList.remove('hidden'); 167 $('enable-cellular').hidden = false;
167 $('disableCellular').classList.add('hidden'); 168 $('disable-cellular').hidden = true;
168 } 169 }
170 if (!AccountsOptions.currentUserIsOwner())
171 $('internet-owner-only-warning').hidden = false;
169 } else { 172 } else {
170 $('enableCellular').classList.add('hidden'); 173 $('enable-cellular').hidden = true;
171 $('disableCellular').classList.add('hidden'); 174 $('disable-cellular').hidden = true;
175 $('enable-data-roaming').hidden = true;
172 } 176 }
173 177
174 InternetOptions.useSettingsUI = data.networkUseSettingsUI; 178 InternetOptions.useSettingsUI = data.networkUseSettingsUI;
175 }; 179 };
176 180
177 // Prevent clobbering of password input field. 181 // Prevent clobbering of password input field.
178 InternetOptions.lockUpdates = function () { 182 InternetOptions.lockUpdates = function () {
179 InternetOptions.updateLocked = true; 183 InternetOptions.updateLocked = true;
180 }; 184 };
181 185
(...skipping 11 matching lines...) Expand all
193 var page = $('internetPage'); 197 var page = $('internetPage');
194 if (data.accessLocked) { 198 if (data.accessLocked) {
195 page.setAttribute('accesslocked', true); 199 page.setAttribute('accesslocked', true);
196 return; 200 return;
197 } 201 }
198 page.removeAttribute('accesslocked'); 202 page.removeAttribute('accesslocked');
199 if (InternetOptions.updateLocked) { 203 if (InternetOptions.updateLocked) {
200 InternetOptions.updateData = data; 204 InternetOptions.updateData = data;
201 InternetOptions.updatePending = true; 205 InternetOptions.updatePending = true;
202 } else { 206 } else {
203 $('wiredList').load(data.wiredList); 207 $('wired-list').load(data.wiredList);
204 $('wirelessList').load(data.wirelessList); 208 $('wireless-list').load(data.wirelessList);
205 $('rememberedList').load(data.rememberedList); 209 $('remembered-list').load(data.rememberedList);
206 210
207 $('wiredSection').hidden = (data.wiredList.length == 0); 211 $('wired-section').hidden = (data.wiredList.length == 0);
208 $('wirelessSection').hidden = (data.wirelessList.length == 0); 212 $('wireless-section').hidden = (data.wirelessList.length == 0);
209 InternetOptions.setupAttributes(data); 213 InternetOptions.setupAttributes(data);
210 $('rememberedSection').hidden = (data.rememberedList.length == 0); 214 $('remembered-section').hidden = (data.rememberedList.length == 0);
211 InternetOptions.updateData = null; 215 InternetOptions.updateData = null;
212 InternetOptions.updatePending = false; 216 InternetOptions.updatePending = false;
213 } 217 }
214 }; 218 };
215 219
216 InternetOptions.updateCellularPlans = function (data) { 220 InternetOptions.updateCellularPlans = function (data) {
217 var page = $('detailsInternetPage'); 221 var page = $('detailsInternetPage');
218 page.removeAttribute('cellplanloading'); 222 page.removeAttribute('cellplanloading');
219 if (data.plans && data.plans.length) { 223 if (data.plans && data.plans.length) {
220 page.removeAttribute('nocellplan'); 224 page.removeAttribute('nocellplan');
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 page.removeAttribute('gsm'); 401 page.removeAttribute('gsm');
398 } 402 }
399 OptionsPage.navigateToPage('detailsInternetPage'); 403 OptionsPage.navigateToPage('detailsInternetPage');
400 }; 404 };
401 405
402 // Export 406 // Export
403 return { 407 return {
404 InternetOptions: InternetOptions 408 InternetOptions: InternetOptions
405 }; 409 };
406 }); 410 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698