More use of widgetNode

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 0ddc962..38b8507 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -332,10 +332,10 @@ function team($, teamName) {
 
     // switching view between targets and records
     function switchView(view) {
-       var targets = findnode('.mkwsTargets');
-       var results = findnode('.mkwsResults,.mkwsRecords');
-       var blanket = findnode('.mkwsBlanket');
-       var motd    = findnode('.mkwsMOTD');
+       var targets = widgetNode('Targets');
+       var results = widgetNode('Results') || widgetNode('Records');
+       var blanket = widgetNode('Blanket');
+       var motd    = widgetNode('MOTD');
 
        switch(view) {
         case 'targets':
@@ -452,13 +452,13 @@ function team($, teamName) {
        mkwsHtmlSwitch();
 
        findnode('.mkwsSearchForm').submit(function() {
-           var val = findnode('.mkwsQuery').val();
+           var val = widgetNode('Query').val();
            newSearch(val);
            return false;
        });
 
        // on first page, hide the termlist
-       $(document).ready(function() { findnode(".mkwsTermlists").hide(); });
+       $(document).ready(function() { widgetNode("Termlists").hide(); });
         var container = findnode(".mkwsMOTDContainer");
        if (container.length) {
            // Move the MOTD from the provided element down into the container
@@ -620,6 +620,13 @@ function team($, teamName) {
     that.findnode = findnode;
 
 
+    // This much simpler and more efficient function should be usable
+    // in place of most uses of findnode.
+    function widgetNode(type) {
+        var w = that.widget(type);
+        return w ? $(w.node) : undefined;
+    }
+
     function renderDetails(data, marker) {
        var template = loadTemplate("Record");
        var details = template(data);