gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-07 18:14:11 +01:00
Code Issues Projects Releases Wiki Activity

Add {, }, [{arg}, ]{arg}. Closes issue #592.

Browse Source
This commit is contained in:
Kris Maglione
2011-07-28 00:09:37 -04:00
parent 2b43cf0660
commit a63d61612d
8 changed files with 118 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/modules/template.jsm
View File

@@ -247,7 +247,7 @@ var Template = Module("Template", {
linkifyHelp: function linkifyHelp(str, help) {
let re = util.regexp(<![CDATA[
(?P<pre> [/\s]|^)
(?P<tag> '[\w-]+' | :(?:[\w-]+!?|!) | (?:._)?<[\w-]+>\w* | [a-zA-Z]_\w+ | \[[\w-]+\] | E\d{3} )
(?P<tag> '[\w-]+' | :(?:[\w-]+!?|!) | (?:._)?<[\w-]+>\w* | \b[a-zA-Z]_(?:\w+|.) | \[[\w-]+\] | E\d{3} )
(?= [[\)!,:;./\s]|$)
]]>, "gx");
return this.highlightSubstrings(str, (function () {

3
common/modules/util.jsm
View File

@@ -620,7 +620,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
range.selectNode(node);
node = range;
}
let doc = (node.getRangeAt ? node.getRangeAt(0) : node).startContainer.ownerDocument;
let doc = (node.getRangeAt ? node.getRangeAt(0) : node).startContainer;
doc = doc.ownerDocument || doc;
let encoder = services.HtmlEncoder();
encoder.init(doc, "text/unicode", encoder.OutputRaw|encoder.OutputPreformatted);