wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-07-02 18:25:51 -04:00
commit e06e8f7da3
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dom/wifi/DOMWifiManager.js
View File

@ -20,6 +20,29 @@ const DOMWIFIMANAGER_CID = Components.ID("{2cf775a7-1837-410c-9e26-323c42
function DOMWifiManager() {
}
function exposeCurrentNetwork(currentNetwork) {
currentNetwork.__exposedProps__ = exposeCurrentNetwork.currentNetworkApi;
}
exposeCurrentNetwork.currentNetworkApi = {
ssid: "r",
known: "r"
};
// For smaller, read-only APIs, we expose any property that doesn't begin with
// an underscore.
function exposeReadOnly(obj) {
var exposedProps = {};
for (let i in obj) {
if (i[0] === "_")
continue;
exposedProps[i] = "r";
}
obj.__exposedProps__ = exposedProps;
return obj;
}
DOMWifiManager.prototype = {
__proto__: DOMRequestIpcHelper.prototype,
@ -65,6 +88,8 @@ DOMWifiManager.prototype = {
var state = this._mm.sendSyncMessage("WifiManager:getState")[0];
if (state) {
this._currentNetwork = state.network;
if (this._currentNetwork)
exposeCurrentNetwork(this._currentNetwork);
this._lastConnectionInfo = state.connectionInfo;
this._enabled = state.enabled;
this._connectionStatus = state.status;
@ -110,7 +135,7 @@ DOMWifiManager.prototype = {
case "WifiManager:getNetworks:Return:OK":
request = this.takeRequest(msg.rid);
Services.DOMRequest.fireSuccess(request, msg.data);
Services.DOMRequest.fireSuccess(request, exposeReadOnly(msg.data));
break;
case "WifiManager:getNetworks:Return:NO":
@ -151,18 +176,21 @@ DOMWifiManager.prototype = {
case "WifiManager:onconnecting":
this._currentNetwork = msg.network;
exposeCurrentNetwork(this._currentNetwork);
this._connectionStatus = "connecting";
this._fireStatusChangeEvent();
break;
case "WifiManager:onassociate":
this._currentNetwork = msg.network;
exposeCurrentNetwork(this._currentNetwork);
this._connectionStatus = "associated";
this._fireStatusChangeEvent();
break;
case "WifiManager:onconnect":
this._currentNetwork = msg.network;
exposeCurrentNetwork(this._currentNetwork);
this._connectionStatus = "connected";
this._fireStatusChangeEvent();
break;
@ -255,7 +283,8 @@ DOMWifiManager.prototype = {
get connection() {
if (!this._hasPrivileges)
throw new Components.Exception("Denied", Cr.NS_ERROR_FAILURE);
return { status: this._connectionStatus, network: this._currentNetwork };
return exposeReadOnly({ status: this._connectionStatus,
network: this._currentNetwork });
},
get connectionInfo() {

21
dom/wifi/WifiWorker.js
View File

@ -864,7 +864,7 @@ var WifiManager = (function() {
// Public interface of the wifi service
manager.setWifiEnabled = function(enable, callback) {
if (enabled === manager.enabled) {
if (enable === manager.enabled) {
callback("no change");
return;
}
@ -1136,8 +1136,27 @@ function ScanResult(ssid, bssid, flags, signal) {
this.capabilities = getKeyManagement(flags);
this.signalStrength = signal;
this.relSignalStrength = calculateSignal(Number(signal));
this.__exposedProps__ = ScanResult.api;
}
// XXX This should probably live in the DOM-facing side, but it's hard to do
// there, so we stick this here.
ScanResult.api = {
ssid: "r",
bssid: "r",
capabilities: "r",
signalStrength: "r",
relSignalStrength: "r",
connected: "r",
keyManagement: "rw",
psk: "rw",
identity: "rw",
password: "rw",
wep: "rw"
};
function quote(s) {
return '"' + s + '"';
}