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

Fix NEWS munging broken by charset corruption after moving to modules.

Browse Source
This commit is contained in:
Kris Maglione
2011-09-06 10:04:38 -04:00
parent a5aafe63d9
commit 34e9e55489
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/events.js
View File

@@ -1318,7 +1318,7 @@ var Events = Module("events", {
else else
for (let event in values(duringFeed)) for (let event in values(duringFeed))
try { try {
this.dispatch(event.originalTarget, event, event); DOM.Event.dispatch(event.originalTarget, event, event);
} }
catch (e) { catch (e) {
util.reportError(e); util.reportError(e);

6
common/modules/addons.jsm
View File

@@ -117,7 +117,7 @@ var actions = {
}); });
}, },
get filter() { get filter() {
let ids = Set(keys(JSON.parse(prefs.get("extensions.bootstrappedAddons", "{}")))); let ids = XPIProvider.bootstrappedAddons;
return function ({ item }) !item.userDisabled && Set.has(ids, item.id); return function ({ item }) !item.userDisabled && Set.has(ids, item.id);
}, },
perm: "disable" perm: "disable"
@@ -492,8 +492,10 @@ var Addons = Module("addons", {
} }
}); });
if (!services.has("extensionManager")) if (!services.has("extensionManager")) {
Components.utils.import("resource://gre/modules/AddonManager.jsm"); Components.utils.import("resource://gre/modules/AddonManager.jsm");
var { XPIProvider } = Components.utils.import("resource://gre/modules/XPIProvider.jsm", {});
}
else else
var AddonManager = { var AddonManager = {
PERM_CAN_UNINSTALL: 1, PERM_CAN_UNINSTALL: 1,

3
common/modules/dom.jsm
View File

@@ -84,6 +84,7 @@ var DOM = Class("DOM", {
["", { ["", {
href: { get: function (elem) elem.href || elem.getAttribute("href") }, href: { get: function (elem) elem.href || elem.getAttribute("href") },
src: { get: function (elem) elem.src || elem.getAttribute("src") }, src: { get: function (elem) elem.src || elem.getAttribute("src") },
checked: { get: function (elem) elem.checked, set: function (elem, val) elem.checked = val },
collapsed: BooleanAttribute("collapsed"), collapsed: BooleanAttribute("collapsed"),
disabled: BooleanAttribute("disabled"), disabled: BooleanAttribute("disabled"),
hidden: BooleanAttribute("hidden"), hidden: BooleanAttribute("hidden"),
@@ -209,7 +210,7 @@ var DOM = Class("DOM", {
if (isObject(tmp) && "length" in tmp) if (isObject(tmp) && "length" in tmp)
for (let j = 0; j < tmp.length; j++) for (let j = 0; j < tmp.length; j++)
res[res.length++] = tmp[j]; res[res.length++] = tmp[j];
else if (tmp !== undefined) else if (tmp != null)
res[res.length++] = tmp; res[res.length++] = tmp;
} }

4
common/modules/help.jsm
View File

@@ -250,7 +250,7 @@ var Help = Module("Help", {
{ mimeType: "text/plain;charset=UTF-8" }) { mimeType: "text/plain;charset=UTF-8" })
.responseText; .responseText;
let re = util.regexp(<![CDATA[ let re = util.regexp(UTF8(<![CDATA[
^ (?P<comment> \s* # .*\n) ^ (?P<comment> \s* # .*\n)
| ^ (?P<space> \s*) | ^ (?P<space> \s*)
@@ -266,7 +266,7 @@ var Help = Module("Help", {
) )
| (?: ^ [^\S\n]* \n) + | (?: ^ [^\S\n]* \n) +
]]>, "gmxy"); ]]>), "gmxy");
let betas = util.regexp(/\[(b\d)\]/, "gx"); let betas = util.regexp(/\[(b\d)\]/, "gx");

11
common/modules/util.jsm
View File

@@ -422,8 +422,9 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
* @returns [string] The resulting strings. * @returns [string] The resulting strings.
*/ */
debrace: function debrace(pattern) { debrace: function debrace(pattern) {
let res = [];
if (isArray(pattern)) { if (isArray(pattern)) {
let res = [];
let rec = function rec(acc) { let rec = function rec(acc) {
let vals; let vals;
@@ -454,6 +455,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
res.push(pattern.substr(end)); res.push(pattern.substr(end));
return res.map(function (s) util.dequote(s, dequote)); return res.map(function (s) util.dequote(s, dequote));
} }
let patterns = []; let patterns = [];
let substrings = split(pattern, /((?:[^\\{]|\\.)*)\{((?:[^\\}]|\\.)*)\}/gy, let substrings = split(pattern, /((?:[^\\{]|\\.)*)\{((?:[^\\}]|\\.)*)\}/gy,
function (match) { function (match) {
@@ -461,7 +463,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
null, ",{}")); null, ",{}"));
}, "{}"); }, "{}");
let res = [];
function rec(acc) { function rec(acc) {
if (acc.length == patterns.length) if (acc.length == patterns.length)
res.push(array(substrings).zip(acc).flatten().join("")); res.push(array(substrings).zip(acc).flatten().join(""));
@@ -1153,10 +1154,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
error = Error(error); error = Error(error);
Cu.reportError(error); Cu.reportError(error);
try {
services.console.logStringMessage(error.stack || Error().stack);
}
catch (e) {}
try { try {
this.errorCount++; this.errorCount++;
@@ -1166,6 +1163,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
stack: <>{util.stackLines(String(error.stack || Error().stack)).join("\n").replace(/^/mg, "\t")}</> stack: <>{util.stackLines(String(error.stack || Error().stack)).join("\n").replace(/^/mg, "\t")}</>
}); });
services.console.logStringMessage(obj.stack);
this.errors.push([new Date, obj + "\n" + obj.stack]); this.errors.push([new Date, obj + "\n" + obj.stack]);
this.errors = this.errors.slice(-this.maxErrors); this.errors = this.errors.slice(-this.maxErrors);
this.errors.toString = function () [k + "\n" + v for ([k, v] in array.iterValues(this))].join("\n\n"); this.errors.toString = function () [k + "\n" + v for ([k, v] in array.iterValues(this))].join("\n\n");