Emitters now include the triggering element in the emitted event. Modal updated for the new element.

app/js/ui/Emitters.js

 
 function handle_emitter(event){
   if (this.hasAttribute("emit")){
-    var args = [this.getAttribute("emit")];
+    var args = [this.getAttribute("emit"), this];
     if (this.hasAttribute("emit-args")){
       try {
         var j = JSON.parse(this.getAttribute("emit-args"));
           args.push(j);
         }
       } catch (e) {
-        console.log("Failed to emit '" + args[0] + "'. Attribute 'emit-args' contains malformed JSON.");
+        console.log("Failed to emit '" + args[0] +"': " + e.toString());
+        //console.log("Failed to emit '" + args[0] + "'. Attribute 'emit-args' contains malformed JSON.");
       }
     }
     GlobalEvents.emit.apply(GlobalEvents, args);

app/js/ui/Modal.js

       }
     }).bind(this));
 
-    GlobalEvents.listen("modal-open", (function(event){
+    GlobalEvents.listen("modal-open", (function(target, event){
       if (event.hasOwnProperty("id") && typeof(event.id) === 'string'){
         var force = (event.hasOwnProperty("force")) ? event.force === true : false;
         this.open_modal_id(event.id, force);
       }
     }).bind(this));
 
-    GlobalEvents.listen("modal-close", (function(event){
+    GlobalEvents.listen("modal-close", (function(target, event){
       this.close_modal();
     }).bind(this));
   }