brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network: Remove _createAPItem

Browse Source 
The code flows better if this is inlined like this.

https://bugzilla.gnome.org/show_bug.cgi?id=698918
This commit is contained in:
Jasper St. Pierre 2013-04-25 20:39:19 -04:00
parent 2249da7976
commit 9c222c7e5c
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/ui/status/network.js
View File

@ -1069,21 +1069,6 @@ const NMDeviceWireless = new Lang.Class({
} }
}, },
_createAPItem: function(connection, accessPointObj) {
let item = new NMNetworkMenuItem(accessPointObj.accessPoints[0]);
item._connection = connection;
item.connect('activate', Lang.bind(this, function() {
let accessPoints = accessPointObj.accessPoints;
for (let i = 0; i < accessPoints.length; i++) {
if (accessPoints[i].connection_valid(connection)) {
this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
break;
}
}
}));
return item;
},
_clearSection: function() { _clearSection: function() {
this.parent(); this.parent();
@ -1180,10 +1165,20 @@ const NMDeviceWireless = new Lang.Class({
return; return;
} }
if(network.connections.length > 0) {
network.item = this._createAPItem(network.connections[0], network);
} else {
network.item = new NMNetworkMenuItem(network.accessPoints[0]); network.item = new NMNetworkMenuItem(network.accessPoints[0]);
if(network.connections.length > 0) {
let connection = network.connections[0];
network.item._connection = connection;
network.item.connect('activate', Lang.bind(this, function() {
let accessPoints = network.accessPoints;
for (let i = 0; i < accessPoints.length; i++) {
if (accessPoints[i].connection_valid(connection)) {
this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
break;
}
}
}));
} else {
network.item.connect('activate', Lang.bind(this, function() { network.item.connect('activate', Lang.bind(this, function() {
let accessPoints = network.accessPoints; let accessPoints = network.accessPoints;
if ( (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT) if ( (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)