gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 09:08:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Kris Maglione
2009-11-12 16:01:11 -05:00
parent 5c3d06f141 01696096b0
commit f19a4edcee
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/content/liberator.js
View File

@@ -66,6 +66,8 @@ const Liberator = Module("liberator", {
// without explicitly selecting a profile. // without explicitly selecting a profile.
/** @property {string} The name of the current user profile. */ /** @property {string} The name of the current user profile. */
this.profileName = services.get("directory").get("ProfD", Ci.nsIFile).leafName.replace(/^.+?\./, ""); this.profileName = services.get("directory").get("ProfD", Ci.nsIFile).leafName.replace(/^.+?\./, "");
config.features.push(Liberator.getPlatformFeature());
}, },
destroy: function () { destroy: function () {
@@ -1730,8 +1732,6 @@ const Liberator = Module("liberator", {
}; };
}, },
load: function () { load: function () {
config.features.push(Liberator.getPlatformFeature());
liberator.triggerObserver("load"); liberator.triggerObserver("load");
liberator.log("All modules loaded", 3); liberator.log("All modules loaded", 3);

16
common/content/options.js
View File

@@ -1117,27 +1117,11 @@ const Options = Module("options", {
else if (matches[3] == ".") else if (matches[3] == ".")
reference[0][reference[1]] += expr.toString(); reference[0][reference[1]] += expr.toString();
} }
else {
if (!reference[0]) {
if (reference[2] == "g")
reference[0] = liberator.globalVariables;
else
return; // for now
}
if (matches[3]) {
if (matches[3] == "+")
reference[0][reference[1]] += expr;
else if (matches[3] == "-")
reference[0][reference[1]] -= expr;
else if (matches[3] == ".")
reference[0][reference[1]] += expr.toString();
}
else else
reference[0][reference[1]] = expr; reference[0][reference[1]] = expr;
} }
} }
}
// 1 - name // 1 - name
else if (matches = args.match(/^\s*([\w:]+)\s*$/)) { else if (matches = args.match(/^\s*([\w:]+)\s*$/)) {
let reference = liberator.variableReference(matches[1]); let reference = liberator.variableReference(matches[1]);