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

Unified Diff: chrome/browser/resources/options/chromeos_internet_options.js

Issue 6516019: Made activate/buy button show consistently on network list and details pages.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/chromeos_internet_options.js
===================================================================
--- chrome/browser/resources/options/chromeos_internet_options.js (revision 75135)
+++ chrome/browser/resources/options/chromeos_internet_options.js (working copy)
@@ -53,7 +53,7 @@
});
$('detailsInternetLogin').addEventListener('click', function(event) {
InternetOptions.loginFromDetails();
- });;
+ });
$('activateDetails').addEventListener('click', function(event) {
InternetOptions.activateFromDetails();
});
@@ -213,17 +213,30 @@
page.setAttribute('nocellplan', true);
page.removeAttribute('hascellplan');
}
- if (!data.needsPlan) {
+
+ if (!data.needsPlan)
page.setAttribute('hasactiveplan', true);
- } else {
+ else
page.removeAttribute('hasactiveplan');
- }
+
if (data.activated) {
page.setAttribute('activated', true);
} else {
page.removeAttribute('activated');
+ $('detailsInternetLogin').classList.add('hidden');
}
+ // CSS selectors don't like me anymore, switching to classList
+ if (data.showBuyButton)
+ $('buyplanDetails').classList.remove('hidden');
+ else
+ $('buyplanDetails').classList.add('hidden');
+
+ if (data.showActivateButton)
+ $('activateDetails').classList.remove('hidden');
+ else
+ $('activateDetails').classList.add('hidden');
+
// Nudge webkit so that it redraws the details overlay page.
// See http://crosbug.com/9616 for details.
// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=50176
@@ -239,11 +252,9 @@
InternetOptions.showDetailedInfo = function (data) {
var page = $('detailsInternetPage');
- if (data.connected) {
- $('inetTitle').textContent = localStrings.getString('inetStatus');
- } else {
- $('inetTitle').textContent = localStrings.getString('inetConnect');
- }
+ $('buyplanDetails').classList.add('hidden');
+ $('activateDetails').classList.add('hidden');
+ $('detailsInternetLogin').classList.add('hidden');
if (data.connecting) {
page.setAttribute('connecting', data.connecting);
} else {
@@ -251,8 +262,11 @@
}
if (data.connected) {
page.setAttribute('connected', data.connected);
+ $('inetTitle').textContent = localStrings.getString('inetStatus');
} else {
page.removeAttribute('connected');
+ $('inetTitle').textContent = localStrings.getString('inetConnect');
+ $('detailsInternetLogin').classList.remove('hidden');
}
$('connectionState').textContent = data.connectionState;
var address = $('inetAddress');
@@ -339,6 +353,20 @@
$('imsi').textContent = data.imsi;
page.setAttribute('gsm', true);
}
+
+ // CSS selectors don't like me anymore, switching to classList
+ if (data.showBuyButton)
+ $('buyplanDetails').classList.remove('hidden');
+ else
+ $('buyplanDetails').classList.add('hidden');
+
+ if (data.showActivateButton) {
+ $('activateDetails').classList.remove('hidden')
+ $('detailsInternetLogin').classList.add('hidden');
+ } else {
+ $('activateDetails').classList.add('hidden');
+ }
+
page.removeAttribute('hascellplan');
if (data.connected) {
page.removeAttribute('nocellplan');

Powered by Google App Engine
This is Rietveld 408576698