summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/content/buffer.js8
-rw-r--r--common/modules/dom.jsm10
2 files changed, 10 insertions, 8 deletions
diff --git a/common/content/buffer.js b/common/content/buffer.js
index b41e81f9..fab4283e 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -2161,7 +2161,9 @@ var Buffer = Module("buffer", {
"code.google.com": '#nums [id^="nums_table"] a[href^="#"]',
"github.com": '.line_numbers>*',
"mxr.mozilla.org": 'a.l',
- "pastebin.com": '#code_frame>div>ol>li'
+ "pastebin.com": '#code_frame>div>ol>li',
+ "addons.mozilla.org": '.gutter>.line>a',
+ "*": '/* Hgweb/Gitweb */ .completecodeline a.codeline, a.linenr'
},
{
getLine: function getLine(doc, line) {
@@ -2191,12 +2193,12 @@ var Buffer = Module("buffer", {
return vals;
},
- validate: function validate(values) {
+ validator: function validate(values) {
return this.testValues(values, function (value) {
if (/^func:/.test(value))
return callable(dactyl.userEval("(" + Option.dequote(value.substr(5)) + ")"));
else
- return DOM.testMatcher(value);
+ return DOM.testMatcher(Option.dequote(value));
});
}
});
diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 3110ecb0..482b0214 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -1347,16 +1347,16 @@ var DOM = Class("DOM", {
* @returns {boolean} True when the patterns are all valid.
*/
validateMatcher: function validateMatcher(list) {
- let evaluator = services.XPathEvaluator();
- let node = services.XMLDocument();
- return this.testValues(list, this.closure.testMatcher);
+ return this.testValues(list, DOM.closure.testMatcher);
},
testMatcher: function testMatcher(value) {
+ let evaluator = services.XPathEvaluator();
+ let node = services.XMLDocument();
if (/^xpath:/.test(value))
- evaluator.createExpression(value.substr(6), DOM.XPath.resolver);
+ util.withProperErrors("createExpression", evaluator, value.substr(6), DOM.XPath.resolver);
else
- node.querySelector(value);
+ util.withProperErrors("querySelector", node, value);
return true;
},