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

Support Firefox 45 (without e10s).

Browse Source
This commit is contained in:
Kris Maglione
2015-12-19 20:09:04 -08:00
parent e3c3748511
commit bc9eb79fb3
41 changed files with 614 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/modules/contexts.jsm
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2010-2014 Kris Maglione <maglione.k@gmail.com>
// Copyright (c) 2010-2015 Kris Maglione <maglione.k@gmail.com>
//
// This work is licensed for reuse under an MIT license. Details are
// given in the LICENSE.txt file included with this file.
@@ -220,7 +220,7 @@ var Contexts = Module("contexts", {
memoize(contexts.groupsProto, name, function () {
return [group[name]
for (group of values(this.groups))
if (hasOwnProperty(group, name))];
if (hasOwnProp(group, name))];
});
},
@@ -242,13 +242,13 @@ var Contexts = Module("contexts", {
let id = util.camelCase(name.replace(/\.[^.]*$/, ""));
let contextPath = file.path;
let self = hasOwnProperty(plugins, contextPath) && plugins.contexts[contextPath];
let self = hasOwnProp(plugins, contextPath) && plugins.contexts[contextPath];
if (!self && isPlugin && false)
self = hasOwnProperty(plugins, id) && plugins[id];
self = hasOwnProp(plugins, id) && plugins[id];
if (self) {
if (hasOwnProperty(self, "onUnload"))
if (hasOwnProp(self, "onUnload"))
util.trapErrors("onUnload", self);
}
else {
@@ -340,7 +340,7 @@ var Contexts = Module("contexts", {
.replace(File.PATH_SEP, "-");
let id = util.camelCase(name.replace(/\.[^.]*$/, ""));
let self = hasOwnProperty(this.pluginModules, canonical) && this.pluginModules[canonical];
let self = hasOwnProp(this.pluginModules, canonical) && this.pluginModules[canonical];
if (!self) {
self = Object.create(jsmodules);
@@ -446,7 +446,7 @@ var Contexts = Module("contexts", {
let need = hive ? [hive]
: Object.keys(this.hives);
return this.groupList.filter(group => need.some(hasOwnProperty.bind(null, group)));
return this.groupList.filter(group => need.some(hasOwnProp.bind(null, group)));
},
addGroup: function addGroup(name, description, filter, persist, replace) {
@@ -506,7 +506,7 @@ var Contexts = Module("contexts", {
getGroup: function getGroup(name, hive) {
if (name === "default")
var group = this.context && this.context.context && this.context.context.GROUP;
else if (hasOwnProperty(this.groupMap, name))
else if (hasOwnProp(this.groupMap, name))
group = this.groupMap[name];
if (group && hive)
@@ -691,7 +691,7 @@ var Contexts = Module("contexts", {
util.assert(!group.builtin ||
!["-description", "-locations", "-nopersist"]
.some(hasOwnProperty.bind(null, args.explicitOpts)),
.some(prop => hasOwnProp(args.explicitOpts, prop)),
_("group.cantModifyBuiltin"));
}, {
argCount: "?",
@@ -842,7 +842,9 @@ var Contexts = Module("contexts", {
context.keys = {
active: group => group.filter(uri),
text: "name",
description: function (g) ["", g.filter.toJSONXML ? g.filter.toJSONXML(modules).concat("\u00a0") : "", g.description || ""]
description: g => ["",
g.filter.toJSONXML ? g.filter.toJSONXML(modules).concat("\u00a0") : "",
g.description || ""],
};
context.completions = (active === undefined ? contexts.groupList : contexts.initializedGroups(active))
.slice(0, -1);