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

Better handling of operations on list options with complex types. Closes #37.

Browse Source
This commit is contained in:
Kris Maglione
2015-04-25 12:48:31 -07:00
parent aee0c79752
commit 61df94e750
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/modules/options.jsm
View File

@@ -705,9 +705,13 @@ var Option = Class("Option", {
return this.value.filter(function (item) !this.has(item), new RealSet(values));
case "=":
if (invert) {
let keepValues = this.value.filter(function (item) !this.has(item), new RealSet(values));
let addValues = values.filter(function (item) !this.has(item), new RealSet(this.value));
return addValues.concat(keepValues);
let old = this.value.map(String);
let new_ = values.map(String);
let map = Ary(this.value).concat(values).map(val => [String(val), val]).toObject();
let keepValues = old.filter(function (item) !this.has(item), new RealSet(new_));
let addValues = new_.filter(function (item) !this.has(item), new RealSet(old));
return addValues.concat(keepValues).map(s => map[s]);
}
return values;
}

7
common/modules/promises.jsm
View File

@@ -83,6 +83,13 @@ var Promises = Module("Promises", {
});
},
/**
* Returns true if the passed object is a promise.
*/
isPromise: function isPromise(obj) {
return isObject(obj) && typeof obj.then === "function";
},
/**
* Returns a promise which resolves after the given number of
* milliseconds.