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

Deal with fallout from 609832.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-09 16:15:52 -05:00
parent 415386a183
commit 04f55e9324
10 changed files with 148 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/modules/styles.jsm
View File

@@ -309,15 +309,15 @@ var Styles = Module("Styles", {
*/
matchFilter: function (filter) {
if (filter === "*")
function test(uri) true;
var test = function test(uri) true;
else if (/[*]$/.test(filter)) {
let re = RegExp("^" + util.regexp.escape(filter.substr(0, filter.length - 1)));
function test(uri) re.test(uri.spec);
test = function test(uri) re.test(uri.spec);
}
else if (/[\/:]/.test(filter))
function test(uri) uri.spec === filter;
test = function test(uri) uri.spec === filter;
else
function test(uri) { try { return util.isSubdomain(uri.host, filter); } catch (e) { return false; } };
test = function test(uri) { try { return util.isSubdomain(uri.host, filter); } catch (e) { return false; } };
test.toString = function toString() filter;
if (arguments.length < 2)
return test;

23
common/modules/util.jsm
View File

@@ -31,8 +31,8 @@ memoize(this, "Commands", function () {
var FailedAssertion = Class("FailedAssertion", ErrorBase);
var Point = Struct("x", "y");
function wrapCallback(fn)
fn.wrapper = function wrappedCallback () {
var wrapCallback = function wrapCallback(fn)
fn.wrapper = (function wrappedCallback () {
try {
return fn.apply(this, arguments);
}
@@ -40,7 +40,7 @@ function wrapCallback(fn)
util.reportError(e);
return undefined;
}
}
})
var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), {
init: function () {
@@ -820,6 +820,15 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
if (!isObject(object))
return String(object);
function namespaced(node) {
var ns = NAMESPACES[node.namespaceURI] || /^(?:(.*?):)?/.exec(node.name)[0];
if (!ns)
return node.localName;
if (color)
return <><span highlight="HelpXMLNamespace">{ns}</span>{node.localName}</>
return ns + ":" + node.localName;
}
if (object instanceof Ci.nsIDOMElement) {
const NAMESPACES = array.toObject([
[NS, "dactyl"],
@@ -830,14 +839,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
if (elem.nodeType == elem.TEXT_NODE)
return elem.data;
function namespaced(node) {
var ns = NAMESPACES[node.namespaceURI] || /^(?:(.*?):)?/.exec(node.name)[0];
if (!ns)
return node.localName;
if (color)
return <><span highlight="HelpXMLNamespace">{ns}</span>{node.localName}</>
return ns + ":" + node.localName;
}
try {
let hasChildren = elem.firstChild && (!/^\s*$/.test(elem.firstChild) || elem.firstChild.nextSibling)
if (color)