summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-25 07:31:47 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-25 07:31:47 +0000
commitb4d9e206a92c084b5e938efa3f80157b75e2d271 (patch)
tree3aef58e0cac8e074f761352d9829b1df887c7944
parent062897b1b5dd309c9f7d9512292e1237cc59a85e (diff)
downloadchromium_src-b4d9e206a92c084b5e938efa3f80157b75e2d271.zip
chromium_src-b4d9e206a92c084b5e938efa3f80157b75e2d271.tar.gz
chromium_src-b4d9e206a92c084b5e938efa3f80157b75e2d271.tar.bz2
Added missing connect button to cellular network element.
BUG=chromium-os:9641 TEST=make sure that we show [Connect] button on disconnected cellular network element in chrome:settings/internet page Review URL: http://codereview.chromium.org/5379002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67390 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/chromeos_internet_network_element.js24
1 files changed, 13 insertions, 11 deletions
diff --git a/chrome/browser/resources/options/chromeos_internet_network_element.js b/chrome/browser/resources/options/chromeos_internet_network_element.js
index 6b73e74..e5facb2 100644
--- a/chrome/browser/resources/options/chromeos_internet_network_element.js
+++ b/chrome/browser/resources/options/chromeos_internet_network_element.js
@@ -222,17 +222,8 @@ cr.define('options.internet', function() {
'activate']);
}));
}
- if (this.data.connected ||
- this.data.networkType == NetworkItem.TYPE_CELLULAR) {
- buttonsDiv.appendChild(
- this.createButton_('options_button', 'options',
- function(e) {
- chrome.send('buttonClickCallback',
- [String(self.data.networkType),
- self.data.servicePath,
- 'options']);
- }));
- } else if (!this.data.connecting && this.data.connectable) {
+ if (!this.data.connected && !this.data.connecting &&
+ this.data.connectable) {
// connect button (if not ethernet and not showing activate button
// and connectable)
if (this.data.networkType != NetworkItem.TYPE_ETHERNET &&
@@ -247,6 +238,17 @@ cr.define('options.internet', function() {
}));
}
}
+ if (this.data.connected ||
+ this.data.networkType == NetworkItem.TYPE_CELLULAR) {
+ buttonsDiv.appendChild(
+ this.createButton_('options_button', 'options',
+ function(e) {
+ chrome.send('buttonClickCallback',
+ [String(self.data.networkType),
+ self.data.servicePath,
+ 'options']);
+ }));
+ }
} else {
// Put "Forget this network" button.
var button = this.createButton_('forget_button', 'forget',