gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-18 03:53:33 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup/fixes.

Browse Source
This commit is contained in:
Kris Maglione
2014-08-25 22:10:26 -07:00
parent e3abdd7559
commit 0f41b99a03
2 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/content/bookmarks.js
View File

@@ -286,7 +286,7 @@ var Bookmarks = Module("bookmarks", {
var queryURI = engine.getSubmission(query, responseType).uri.spec; var queryURI = engine.getSubmission(query, responseType).uri.spec;
if (!queryURI) if (!queryURI)
return promises.fail(); return Promise.reject();
function parse(req) JSON.parse(req.responseText)[1].filter(isString); function parse(req) JSON.parse(req.responseText)[1].filter(isString);
return this.makeSuggestions(queryURI, parse, callback); return this.makeSuggestions(queryURI, parse, callback);
@@ -311,12 +311,13 @@ var Bookmarks = Module("bookmarks", {
results = parser(req); results = parser(req);
} }
catch (e) { catch (e) {
return deferred.reject(e); deferred.reject(e);
return;
} }
deferred.resolve(results); deferred.resolve(results);
}, Cu.reportError); });
promises.oncancel(deferred, r => promises.cancel(req, reason)); promises.oncancel(deferred, reason => promises.cancel(req, reason));
return deferred.promise; return deferred.promise;
}, },
@@ -756,9 +757,9 @@ var Bookmarks = Module("bookmarks", {
ctxt.cache.request = bookmarks.getSuggestions(name, ctxt.filter); ctxt.cache.request = bookmarks.getSuggestions(name, ctxt.filter);
ctxt.cache.request.then(function (compl) { ctxt.cache.request.then(function (compl) {
ctxt.incomplete = false; ctxt.incomplete = false;
ctxt.completions = array.uniq(ctxt.completions.filter(c => compl.contains(c)) ctxt.completions = array.uniq(ctxt.completions.filter(c => ~compl.indexOf(c))
.concat(compl), true); .concat(compl), true);
}, function (e) { }).catch(function (e) {
ctxt.incomplete = false; ctxt.incomplete = false;
ctxt.completions = []; ctxt.completions = [];
if (e) if (e)

18
common/modules/promises.jsm
View File

@@ -61,24 +61,6 @@ var Promises = Module("Promises", {
mainThread.dispatch(accept, mainThread.DISPATCH_NORMAL); mainThread.dispatch(accept, mainThread.DISPATCH_NORMAL);
}), }),
/**
* Returns a promise which resolves with the given argument.
*/
accept: function fail(arg) {
let deferred = Promise.defer();
deferred.resolve(arg);
return deferred.promise;
},
/**
* Returns a promise which fails with the given argument.
*/
fail: function fail(arg) {
let deferred = Promise.defer();
deferred.reject(arg);
return deferred.promise;
},
/** /**
* Returns a promise which resolves after the given number of * Returns a promise which resolves after the given number of
* milliseconds. * milliseconds.