summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 04:03:38 +0000
committerarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 04:03:38 +0000
commita05d8e170cbe0271828dc9ece24559d1206ded6b (patch)
treebe7efbc4cffe793a22e29553f673ba05f171dace
parent548d98166b4d5b0f2fc0db4a1e7336c256e5148d (diff)
downloadchromium_src-a05d8e170cbe0271828dc9ece24559d1206ded6b.zip
chromium_src-a05d8e170cbe0271828dc9ece24559d1206ded6b.tar.gz
chromium_src-a05d8e170cbe0271828dc9ece24559d1206ded6b.tar.bz2
Hide all elements marked as "gsm-only" in internet-detail.html.
I discovered that certain elements that should be hidden for CDMA networks have the CSS class "gsm-only". These elements (such as the APN selection UI and the "Security" tab) should be hidden for non-GSM networks. Updated the code so that such elements are hidden. Also updated all settings entries that need to be conditionally hidden based on "Cellular.Family" to belong to the "gsm-only" and "cdma-only" classes. BUG=264097 R=stevenjb@chromium.org Review URL: https://codereview.chromium.org/22871013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218635 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/chromeos/internet_detail.html8
-rw-r--r--chrome/browser/resources/options/chromeos/internet_detail.js13
2 files changed, 7 insertions, 14 deletions
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.html b/chrome/browser/resources/options/chromeos/internet_detail.html
index 68563d5..556c70a 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.html
+++ b/chrome/browser/resources/options/chromeos/internet_detail.html
@@ -282,11 +282,11 @@
<td class="option-name" i18n-content="restrictedPool"></td>
<td id="restricted-pool" class="option-value"></td>
</tr>
- <tr class="gsm-only">
+ <tr>
<td class="option-name" i18n-content="operatorName"></td>
<td id="operator-name" class="option-value"></td>
</tr>
- <tr class="gsm-only">
+ <tr>
<td class="option-name" i18n-content="operatorCode"></td>
<td id="operator-code" class="option-value"></td>
</tr>
@@ -374,7 +374,7 @@
<td class="option-name" i18n-content="hardwareRevision"></td>
<td id="hardware-revision" class="option-value"></td>
</tr>
- <tr>
+ <tr class="cdma-only">
<td class="option-name" i18n-content="prlVersion"></td>
<td id="prl-version" class="option-value"></td>
</tr>
@@ -382,7 +382,7 @@
<td class="option-name">MEID:</td>
<td id="meid" class="option-value"></td>
</tr>
- <tr>
+ <tr class="gsm-only">
<td class="option-name">ICCID:</td>
<td id="iccid" class="option-value"></td>
</tr>
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js
index 46014b8..a36df41 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.js
+++ b/chrome/browser/resources/options/chromeos/internet_detail.js
@@ -389,6 +389,8 @@ cr.define('options.internet', function() {
updateHidden('#details-internet-page .wimax-details', !this.wimax);
updateHidden('#details-internet-page .vpn-details', !this.vpn);
updateHidden('#details-internet-page .proxy-details', !this.showProxy);
+ updateHidden('#details-internet-page .gsm-only', !this.gsm);
+ updateHidden('#details-internet-page .cdma-only', this.gsm);
/* Network information merged into the Wifi tab for wireless networks
unless the option is set for enabling a static IP configuration. */
updateHidden('#details-internet-page .network-details',
@@ -1113,12 +1115,10 @@ cr.define('options.internet', function() {
setContentOrHide('esn');
setContentOrHide('imei');
setContentOrHide('meid');
+ setContentOrHide('prl-version');
})();
detailsPage.gsm = data.gsm;
if (data.gsm) {
- // Hide CDMA only properties.
- $('prl-version').parentElement.hidden = true;
-
$('iccid').textContent = data.iccid ? data.iccid : '';
$('imsi').textContent = data.imsi ? data.imsi : '';
@@ -1165,13 +1165,6 @@ cr.define('options.internet', function() {
updateHidden('.apn-list-view', false);
updateHidden('.apn-details-view', true);
DetailsInternetPage.updateSecurityTab(data.simCardLockEnabled.value);
- } else {
- // Hide 3GPP only properties for CDMA.
- $('iccid').parentElement.hidden = true;
- $('imsi').parentElement.hidden = true;
-
- // CDMA only properties.
- $('prl-version').textContent = data.prlVersion ? data.prlVersion : '';
}
$('auto-connect-network-cellular').checked = data.autoConnect.value;
$('auto-connect-network-cellular').disabled = false;