Reorder functions.

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

diff --git a/src/mkws-team.js b/src/mkws-team.js
index ab6eeb2..4e91fce 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -303,16 +303,16 @@ function team($, teamName) {
 
        switch(view) {
         case 'targets':
-            if (targets) targets.css('display', 'block');
-            if (results) results.css('display', 'none');
-            if (blanket) blanket.css('display', 'none');
-            if (motd) motd.css('display', 'none');
+            if (targets) $(targets).show();
+            if (results) $(results).hide();
+            if (blanket) $(blanket).hide();
+            if (motd) $(motd).hide();
             break;
         case 'records':
-            if (targets) targets.css('display', 'none');
-            if (results) results.css('display', 'block');
-            if (blanket) blanket.css('display', 'block');
-            if (motd) motd.css('display', 'none');
+            if (targets) $(targets).hide();
+            if (results) $(results).show();
+            if (blanket) $(blanket).show();
+            if (motd) $(motd).hide();
             break;
         default:
             alert("Unknown view '" + view + "'");
@@ -341,22 +341,6 @@ function team($, teamName) {
     };
 
 
-    // Translation function. At present, this is properly a
-    // global-level function (hence the assignment to mkws.M) but we
-    // want to make it per-team so different teams can operate in
-    // different languages.
-    //
-    function M(word) {
-       var lang = m_config.lang;
-
-       if (!lang || !mkws.locale_lang[lang])
-           return word;
-
-       return mkws.locale_lang[lang][word] || word;
-    }
-    mkws.M = M; // so the Handlebars helper can use it
-
-
     // Finds the node of the specified class within the current team
     function findnode(selector, teamName) {
        teamName = teamName || m_teamName;
@@ -374,8 +358,6 @@ function team($, teamName) {
     }
 
 
-    // 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;
@@ -436,6 +418,17 @@ function team($, teamName) {
         }
     }
 
+    that.widget = function(type) {
+        var list = m_widgets[type];
+
+        if (!list)
+            return undefined;
+        if (list.length > 1) {
+            alert("widget('" + type + "') finds " + list.length + " widgets: using first");
+        }
+        return list[0];
+    }
+
     that.visitWidgets = function(callback) {
         for (var type in m_widgets) {
             var list = m_widgets[type];
@@ -449,26 +442,15 @@ function team($, teamName) {
         return undefined;
     }
 
-    that.widget = function(type) {
-        var list = m_widgets[type];
-
-        if (!list)
-            return undefined;
-        if (list.length > 1) {
-            alert("widget('" + type + "') finds " + list.length + " widgets: using first");
-        }
-        return list[0];
-    }
-
 
-    var lang = mkws.getParameterByName("lang") || m_config.lang;
+    var lang = mkws.getParameterByName("lang") || mkws.config.lang;
     if (!lang || !mkws.locale_lang[lang]) {
-       m_config.lang = ""
+       mkws.config.lang = ""
     } else {
-       m_config.lang = lang;
+       mkws.config.lang = lang;
     }
 
-    log("Locale language: " + (m_config.lang ? m_config.lang : "none"));
+    log("Locale language: " + (mkws.config.lang ? mkws.config.lang : "none"));
 
     return that;
 };