Merge key-processing.

1 files changed, 11 insertions, 1 deletions

diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index d9db8cb6..902d6f04 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -131,6 +131,16 @@ var Template = Module("Template", {
             update: function update() {
                 this.collapsed = !this.commandAllowed;
             }
+        }),
+
+        Events: Class("Events", Binding, {
+            init: function init(node, params) {
+                init.supercall(this, node);
+
+                let obj = params.eventTarget;
+                for (let [event, handler] in Iterator(obj[this.getAttribute("events") || "events"]))
+                    node.addEventListener(event, obj.closure(handler), false);
+            }
         })
     },
 
@@ -329,7 +339,7 @@ var Template = Module("Template", {
         let re = util.regexp(<![CDATA[
             (?P<pre> [/\s]|^)
             (?P<tag> '[\w-]+' | :(?:[\w-]+|!) | (?:._)?<[\w-]+> )
-            (?=      [[!,;./\s]|$)
+            (?=      [[\)!,;./\s]|$)
         ]]>, "g");
         return this.highlightSubstrings(str, (function () {
             for (let res in re.iterate(str))