Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 12:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1234020: Part 2l - [webext] Return promises from the alarms API. r=rpl

Browse Source 
--HG--
extra : commitid : A9XdqEK4e0M
extra : rebase_source : a972bae6ad03865034b68f1ff8fd9ca125c2126e
This commit is contained in:
Kris Maglione 2016-01-29 18:58:29 -08:00
parent eb18e4d151
commit a4074c6b1d
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
toolkit/components/extensions/ext-alarms.js
View File

@ -5,7 +5,6 @@ var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://gre/modules/ExtensionUtils.jsm"); Cu.import("resource://gre/modules/ExtensionUtils.jsm");
var { var {
EventManager, EventManager,
runSafe,
} = ExtensionUtils; } = ExtensionUtils;
// WeakMap[Extension -> Set[Alarm]] // WeakMap[Extension -> Set[Alarm]]
@ -114,18 +113,22 @@ extensions.registerPrivilegedAPI("alarms", (extension, context) => {
[name, callback] = args; [name, callback] = args;
} }
for (let alarm of alarmsMap.get(extension)) { let promise = new Promise((resolve, reject) => {
if (alarm.name == name) { for (let alarm of alarmsMap.get(extension)) {
runSafe(context, callback, alarm.data); if (alarm.name == name) {
break; return resolve(alarm.data);
}
} }
} reject("No matching alarm");
});
return context.wrapPromise(promise, callback);
}, },
getAll: function(callback) { getAll: function(callback) {
let alarms = alarmsMap.get(extension); let alarms = alarmsMap.get(extension);
let result = alarms.map(alarm => alarm.data); let result = alarms.map(alarm => alarm.data);
runSafe(context, callback, result); return context.wrapPromise(Promise.resolve(result), callback);
}, },
clear: function(...args) { clear: function(...args) {
@ -146,9 +149,7 @@ extensions.registerPrivilegedAPI("alarms", (extension, context) => {
} }
} }
if (callback) { return context.wrapPromise(Promise.resolve(cleared), callback);
runSafe(context, callback, cleared);
}
}, },
clearAll: function(callback) { clearAll: function(callback) {
@ -158,9 +159,7 @@ extensions.registerPrivilegedAPI("alarms", (extension, context) => {
alarm.clear(); alarm.clear();
cleared = true; cleared = true;
} }
if (callback) { return context.wrapPromise(Promise.resolve(cleared), callback);
runSafe(context, callback, cleared);
}
}, },
onAlarm: new EventManager(context, "alarms.onAlarm", fire => { onAlarm: new EventManager(context, "alarms.onAlarm", fire => {