Set full-record HTML using jQuery rather than innerHTML.

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 039ca55..3a44f46 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -142,29 +142,6 @@ var mkws = {
 };
 
 
-// The following PubSub code is modified from the jQuery manual:
-// https://api.jquery.com/jQuery.Callbacks/
-//
-// Use as:
-//     mkws.queue("eventName").subscribe(function(param1, param2 ...) { ... });
-//     mkws.queue("eventName").publish(arg1, arg2, ...);
-
-(function() {
-  var queues = {};
-  mkws.queue = function(id) {
-    if (!queues[id]) {
-      var callbacks = $.Callbacks();
-      queues[id] = {
-       publish: callbacks.fire,
-       subscribe: callbacks.add,
-       unsubscribe: callbacks.remove
-      };
-    }
-    return queues[id];
-  }
-}());
-
-
 // Define empty mkws_config for simple applications that don't define it.
 if (mkws_config == null || typeof mkws_config != 'object') {
     var mkws_config = {};
@@ -193,8 +170,12 @@ function widget($, team, type, node) {
     return that;
 
 
+    // Functions follow for promoting the regular widget object into
+    // widgets of specific types. These could be moved outside of the
+    // widget object, or even into their own source files.
+
     function promoteTargets() {
-       mkws.queue("targets." + team.name()).subscribe(function(data) {
+       team.queue("targets").subscribe(function(data) {
            if (node.length === 0) alert("huh?!");
 
            var table ='<table><thead><tr>' +
@@ -221,7 +202,7 @@ function widget($, team, type, node) {
 
 
     function promoteStat() {
-       mkws.queue("stat").subscribe(function(data) {
+       team.queue("stat").subscribe(function(data) {
            if (node.length === 0)  alert("huh?!");
 
            $(node).html('<span class="head">' + M('Status info') + '</span>' +
@@ -307,13 +288,13 @@ function team($, teamName) {
 
     function onBytarget(data) {
        debug("target");
-       mkws.queue("targets." + m_teamName).publish(data);
+       queue("targets").publish(data);
     }
 
 
     function onStat(data) {
        debug("stat");
-       mkws.queue("stat").publish(data);
+       queue("stat").publish(data);
     }
 
 
@@ -388,9 +369,10 @@ function team($, teamName) {
        var detRecordDiv = document.getElementById('mkwsDet_' + teamName + '_' + data.recid);
        if (detRecordDiv) return;
        m_curDetRecData = data;
+       // Can't use jQuery's $('#x') syntax to find this ID, because it contains spaces.
        var recordDiv = document.getElementById('mkwsRecdiv_' + teamName + '_' + m_curDetRecData.recid);
        var html = renderDetails(m_curDetRecData);
-       recordDiv.innerHTML += html;
+       $(recordDiv).append(html);
     }
 
 
@@ -1189,6 +1171,29 @@ function team($, teamName) {
     }
 
 
+    // The following PubSub code is modified from the jQuery manual:
+    // https://api.jquery.com/jQuery.Callbacks/
+    //
+    // Use as:
+    // team.queue("eventName").subscribe(function(param1, param2 ...) { ... });
+    // team.queue("eventName").publish(arg1, arg2, ...);
+
+    var queues = {};
+    var queue = function(id) {
+       if (!queues[id]) {
+           var callbacks = $.Callbacks();
+           queues[id] = {
+               publish: callbacks.fire,
+               subscribe: callbacks.add,
+               unsubscribe: callbacks.remove
+           };
+       }
+       return queues[id];
+    }
+
+    that.queue = queue;
+
+
     // main
     (function() {
        try {