Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 07:34:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 773596 - Alarm API (make up missing sendAsyncMessage() for some early-return if-blocks). r=vivien

Browse Source
This commit is contained in:
Gene Lian 2012-07-13 20:01:43 +08:00
parent 6e7f656ffd
commit 7d83a6d22b
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dom/alarm/AlarmService.jsm
View File

@ -81,16 +81,10 @@ let AlarmService = {
this._db.getAll(
function getAllSuccessCb(aAlarms) {
debug("Callback after getting alarms from database: " + JSON.stringify(aAlarms));
ppmm.sendAsyncMessage(
"AlarmsManager:GetAll:Return:OK",
{ requestID: json.requestID, alarms: aAlarms }
);
this._sendAsyncMessage("GetAll:Return:OK", json.requestId, aAlarms);
}.bind(this),
function getAllErrorCb(aErrorMsg) {
ppmm.sendAsyncMessage(
"AlarmsManager:GetAll:Return:KO",
{ requestID: json.requestID, errorMsg: aErrorMsg }
);
this._sendAsyncMessage("GetAll:Return:KO", json.requestId, aErrorMsg);
}.bind(this)
);
break;
@ -116,6 +110,7 @@ let AlarmService = {
if (newAlarmTime <= Date.now()) {
debug("Adding a alarm that has past time. Don't set it in system.");
this._debugCurrentAlarm();
this._sendAsyncMessage("Add:Return:OK", json.requestId, aNewId);
return;
}
@ -123,6 +118,7 @@ let AlarmService = {
if (this._currentAlarm == null) {
this._currentAlarm = newAlarm;
this._debugCurrentAlarm();
this._sendAsyncMessage("Add:Return:OK", json.requestId, aNewId);
return;
}
@ -134,6 +130,7 @@ let AlarmService = {
alarmQueue.unshift(this._currentAlarm);
this._currentAlarm = newAlarm;
this._debugCurrentAlarm();
this._sendAsyncMessage("Add:Return:OK", json.requestId, aNewId);
return;
}
@ -141,17 +138,10 @@ let AlarmService = {
alarmQueue.push(newAlarm);
alarmQueue.sort(this._sortAlarmByTimeStamps.bind(this));
this._debugCurrentAlarm();
ppmm.sendAsyncMessage(
"AlarmsManager:Add:Return:OK",
{ requestID: json.requestID, id: aNewId }
);
this._sendAsyncMessage("Add:Return:OK", json.requestId, aNewId);
}.bind(this),
function addErrorCb(aErrorMsg) {
ppmm.sendAsyncMessage(
"AlarmsManager:Add:Return:KO",
{ requestID: json.requestID, errorMsg: aErrorMsg }
);
this._sendAsyncMessage("Add:Return:KO", json.requestId, aErrorMsg);
}.bind(this)
);
break;
@ -205,6 +195,34 @@ let AlarmService = {
}
},
_sendAsyncMessage: function _sendAsyncMessage(aMessageName, aRequestId, aData) {
debug("_sendAsyncMessage()");
let json = null;
switch (aMessageName)
{
case "Add:Return:OK":
json = { requestId: aRequestId, id: aData };
break;
case "GetAll:Return:OK":
json = { requestId: aRequestId, alarms: aData };
break;
case "Add:Return:KO":
case "GetAll:Return:KO":
json = { requestId: aRequestId, errorMsg: aData };
break;
default:
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
break;
}
if (aMessageName && json)
ppmm.sendAsyncMessage("AlarmsManager:" + aMessageName, json);
},
_onAlarmFired: function _onAlarmFired() {
debug("_onAlarmFired()");

10
dom/alarm/AlarmsManager.js
View File

@ -63,7 +63,7 @@ AlarmsManager.prototype = {
let request = this.createRequest();
this._cpmm.sendAsyncMessage(
"AlarmsManager:Add",
{ requestID: this.getRequestId(request), date: aDate, ignoreTimezone: isIgnoreTimezone, data: aData, manifestURL: this._manifestURL }
{ requestId: this.getRequestId(request), date: aDate, ignoreTimezone: isIgnoreTimezone, data: aData, manifestURL: this._manifestURL }
);
return request;
},
@ -83,7 +83,7 @@ AlarmsManager.prototype = {
let request = this.createRequest();
this._cpmm.sendAsyncMessage(
"AlarmsManager:GetAll",
{ requestID: this.getRequestId(request) }
{ requestId: this.getRequestId(request) }
);
return request;
},
@ -92,10 +92,10 @@ AlarmsManager.prototype = {
debug("receiveMessage(): " + aMessage.name);
let json = aMessage.json;
let request = this.getRequest(json.requestID);
let request = this.getRequest(json.requestId);
if (!request) {
debug("No request stored! " + json.requestID);
debug("No request stored! " + json.requestId);
return;
}
@ -120,7 +120,7 @@ AlarmsManager.prototype = {
debug("Wrong message: " + aMessage.name);
break;
}
this.removeRequest(json.requestID);
this.removeRequest(json.requestId);
},
// nsIDOMGlobalPropertyInitializer implementation