The selectorForAllWidgets function now returns the old scanning

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

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 87070f8..79e95e9 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -427,11 +427,32 @@ mkws.pagerNext = function(tname) {
   }
 
 
+  function selectorForAllWidgets() {
+    if (mkws.config.scan_all_nodes) {
+      log("scanning selector");
+      return '[class^="mkws"],[class*=" mkws"]';
+    } else {
+      log("class-based selector");
+      var s = "";
+      for (var type in mkws.widgetType2function) {
+       if (s) s += ',';
+       s += '.mkws' + type;
+      }
+      return s;
+    }
+  }
+
+
   function makeWidgetsWithin(level, node) {
-    node.find('[class^="mkws"],[class*=" mkws"]').each(function() {
+    node.find(selectorForAllWidgets()).each(function() {
       handleNodeWithTeam(this, function(tname, type) {
-        var oldHTML = this.innerHTML;
         var myTeam = mkws.teams[tname];
+        if (!myTeam) {
+          myTeam = mkws.teams[tname] = team(j, tname);
+          log("Made MKWS team '" + tname + "'");
+        }
+
+        var oldHTML = this.innerHTML;
         var myWidget = widget(j, myTeam, type, this);
         myTeam.addWidget(myWidget);
         var newHTML = this.innerHTML;
@@ -508,21 +529,10 @@ mkws.pagerNext = function(tname) {
       }
     }
 
-    // Find all nodes with an MKWS class, and determine their team from
-    // the mkwsTeam_* class. Make all team objects.
     var then = $.now();
-    $('[class^="mkws"],[class*=" mkws"]').each(function() {
-      handleNodeWithTeam(this, function(tname, type) {
-        if (!mkws.teams[tname]) {
-          mkws.teams[tname] = team(j, tname);
-          log("Made MKWS team '" + tname + "'");
-        }
-      });
-    });
-
     makeWidgetsWithin(1, $(':root'));
-    
     var now = $.now();
+
     log("Walking MKWS nodes took " + (now-then) + " ms");
 
     /*