Bug 1033948 - 0002. Change API naming in DOM. r=vchang

This commit is contained in:
Chuck Lee 2014-07-04 14:37:55 +08:00
Родитель 54263dd57b
Коммит 2b5f659a03
2 изменённых файлов: 12 добавлений и 12 удалений

Просмотреть файл

@ -77,10 +77,10 @@ MozWifiCapabilities.prototype = {
function DOMWifiManager() { function DOMWifiManager() {
this.defineEventHandlerGetterSetter("onstatuschange"); this.defineEventHandlerGetterSetter("onstatuschange");
this.defineEventHandlerGetterSetter("onconnectionInfoUpdate"); this.defineEventHandlerGetterSetter("onconnectioninfoupdate");
this.defineEventHandlerGetterSetter("onenabled"); this.defineEventHandlerGetterSetter("onenabled");
this.defineEventHandlerGetterSetter("ondisabled"); this.defineEventHandlerGetterSetter("ondisabled");
this.defineEventHandlerGetterSetter("onstationInfoUpdate"); this.defineEventHandlerGetterSetter("onstationinfoupdate");
} }
DOMWifiManager.prototype = { DOMWifiManager.prototype = {
@ -117,9 +117,9 @@ DOMWifiManager.prototype = {
"WifiManager:onconnecting", "WifiManager:onassociate", "WifiManager:onconnecting", "WifiManager:onassociate",
"WifiManager:onconnect", "WifiManager:ondisconnect", "WifiManager:onconnect", "WifiManager:ondisconnect",
"WifiManager:onwpstimeout", "WifiManager:onwpsfail", "WifiManager:onwpstimeout", "WifiManager:onwpsfail",
"WifiManager:onwpsoverlap", "WifiManager:connectionInfoUpdate", "WifiManager:onwpsoverlap", "WifiManager:connectioninfoupdate",
"WifiManager:onauthenticating", "WifiManager:onconnectingfailed", "WifiManager:onauthenticating", "WifiManager:onconnectingfailed",
"WifiManager:stationInfoUpdate"]; "WifiManager:stationinfoupdate"];
this.initDOMRequestHelper(aWindow, messages); this.initDOMRequestHelper(aWindow, messages);
this._mm = Cc["@mozilla.org/childprocessmessagemanager;1"].getService(Ci.nsISyncMessageSender); this._mm = Cc["@mozilla.org/childprocessmessagemanager;1"].getService(Ci.nsISyncMessageSender);
@ -379,7 +379,7 @@ DOMWifiManager.prototype = {
this._fireStatusChangeEvent(); this._fireStatusChangeEvent();
break; break;
case "WifiManager:connectionInfoUpdate": case "WifiManager:connectioninfoupdate":
this._lastConnectionInfo = this._convertConnectionInfo(msg); this._lastConnectionInfo = this._convertConnectionInfo(msg);
this._fireConnectionInfoUpdate(msg); this._fireConnectionInfoUpdate(msg);
break; break;
@ -394,7 +394,7 @@ DOMWifiManager.prototype = {
this._connectionStatus = "authenticating"; this._connectionStatus = "authenticating";
this._fireStatusChangeEvent(); this._fireStatusChangeEvent();
break; break;
case "WifiManager:stationInfoUpdate": case "WifiManager:stationinfoupdate":
this._stationNumber = msg.station; this._stationNumber = msg.station;
this._fireStationInfoUpdate(msg); this._fireStationInfoUpdate(msg);
break; break;
@ -426,7 +426,7 @@ DOMWifiManager.prototype = {
}, },
_fireStationInfoUpdate: function onStationInfoUpdate(info) { _fireStationInfoUpdate: function onStationInfoUpdate(info) {
var evt = new this._window.MozWifiStationInfoEvent("stationInfoUpdate", var evt = new this._window.MozWifiStationInfoEvent("stationinfoupdate",
{ station: this._stationNumber} { station: this._stationNumber}
); );
this.__DOM_IMPL__.dispatchEvent(evt); this.__DOM_IMPL__.dispatchEvent(evt);

Просмотреть файл

@ -1112,7 +1112,7 @@ var WifiManager = (function() {
function getWifiHotspotStatus() { function getWifiHotspotStatus() {
wifiCommand.hostapdGetStations(function(result) { wifiCommand.hostapdGetStations(function(result) {
notify("stationInfoUpdate", {station: result}); notify("stationinfoupdate", {station: result});
}); });
} }
@ -2324,8 +2324,8 @@ function WifiWorker() {
}); });
}; };
WifiManager.onstationInfoUpdate = function() { WifiManager.onstationinfoupdate = function() {
self._fireEvent("stationInfoUpdate", { station: this.station }); self._fireEvent("stationinfoupdate", { station: this.station });
}; };
// Read the 'wifi.enabled' setting in order to start with a known // Read the 'wifi.enabled' setting in order to start with a known
@ -2511,8 +2511,8 @@ WifiWorker.prototype = {
} }
self._lastConnectionInfo = info; self._lastConnectionInfo = info;
debug("Firing connectionInfoUpdate: " + uneval(info)); debug("Firing connectioninfoupdate: " + uneval(info));
self._fireEvent("connectionInfoUpdate", info); self._fireEvent("connectioninfoupdate", info);
}); });
} }