gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-11 06:44:13 +01:00
Code Issues Projects Releases Wiki Activity

Use dash for sh where available.

Browse Source
This commit is contained in:
Kris Maglione
2014-03-29 10:04:43 -07:00
parent 3380ed7cb6
commit e7549b249b
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/modules/buffer.jsm
View File

@@ -86,11 +86,16 @@ var Buffer = Module("Buffer", {
* @returns {Promise<string>}
*/
get: promises.withCallbacks(function get([resolve, reject], pref) {
services.contentPrefs.getByDomainAndName(
self.uri.spec, pref, self.loadContext,
{ handleCompletion: () => {},
handleResult: resolve,
handleError: reject });
let pref = services.contentPrefs.getCachedByDomainAndName(
self.uri.spec, pref, self.loadContext);
if (pref)
resolve(pref.value);
else
services.contentPrefs.getByDomainAndName(
self.uri.spec, pref, self.loadContext,
{ handleCompletion: () => {},
handleResult: resolve,
handleError: reject });
}),
/**

15
common/modules/overlay.jsm
View File

@@ -336,18 +336,23 @@ var Overlay = Module("Overlay", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReferen
overrides = update(Object.create(original), overrides);
Object.getOwnPropertyNames(overrides).forEach(function (k) {
let orig, desc = Object.getOwnPropertyDescriptor(overrides, k);
let desc = Object.getOwnPropertyDescriptor(overrides, k);
if (desc.value instanceof Class.Property)
desc = desc.value.init(k) || desc.value;
if (k in object) {
for (let obj = object; obj && !orig; obj = Object.getPrototypeOf(obj))
if (orig = Object.getOwnPropertyDescriptor(obj, k))
for (let obj = object; obj && !orig; obj = Object.getPrototypeOf(obj)) {
var orig = Object.getOwnPropertyDescriptor(obj, k);
if (orig)
Object.defineProperty(original, k, orig);
}
if (!orig)
if (orig = Object.getPropertyDescriptor(object, k))
if (!orig) {
orig = Object.getPropertyDescriptor(object, k);
if (orig)
Object.defineProperty(original, k, orig);
}
}
// Guard against horrible add-ons that use eval-based monkey