gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-20 20:45:47 +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

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