X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=4558fc55875efb3dd29091f1e9887d8b15c1c6da;hb=b75f69516de319ca5c283a70238a482e86303138;hp=d5ce99baaa7099ed0a0c1f53ebe62aeb7fe32690;hpb=4446521fa08502883b598209abe1f580263525a0;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index d5ce99b..4558fc5 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -330,44 +330,35 @@ mkws.pagerNext = function(tname) {
 
 
     function resizePage() {
-	var list = ["mkwsSwitch", "mkwsLang"];
+	var list = ["Switch", "Lang"];
 
-	var targetWidth = mkws.config.responsive_design_width;
+	var threshhold = mkws.config.responsive_design_width;
         var width = $(window).width();
-
-        if (mkws.width === undefined) {
-            // No state change, since we have no previous state
-        } else if (mkws.width <= targetWidth && width > targetWidth) {
-            log("narrow -> wide");
-        } else if (mkws.width > targetWidth && width <= targetWidth) {
-            log("wide -> narrow");
+        var from, to, method;
+
+        if ((mkws.width === undefined || mkws.width > threshhold) &&
+                   width <= threshhold) {
+            from = "wide"; to = "narrow"; method = "hide";
+        } else if ((mkws.width === undefined || mkws.width <= threshhold) &&
+                   width > threshhold) {
+            from = "narrow"; to = "wide"; method = "show";
         }
+        mkws.width = width;
 
-	if (mkws.width > targetWidth && width <= targetWidth) {
-	    log("changing from wide to narrow: " + width);
-	    $(".mkwsTermlist-Container-wide").hide();
-	    $(".mkwsTermlist-Container-narrow").show();
-	    for (var tname in mkws.teams) {
-                mkws.teams[tname].queue("resize-narrow").publish();
-		$(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-narrow.mkwsTeam_" + tname));
-		for(var i = 0; i < list.length; i++) {
-		    $("." + list[i] + ".mkwsTeam_" + tname).hide();
-		}
-	    }
-        } else if (mkws.width <= targetWidth && width > targetWidth) {
-	    log("changing from narrow to wide: " + width);
-	    $(".mkwsTermlist-Container-wide").show();
-	    $(".mkwsTermlist-Container-narrow").hide();
+        if (from) {
+	    log("changing from " + from + " to " + to + ": " + width);
+	    $(".mkwsTermlist-Container-" + from).hide();
+	    $(".mkwsTermlist-Container-" + to).show();
 	    for (var tname in mkws.teams) {
-                mkws.teams[tname].queue("resize-wide").publish();
-		$(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-wide.mkwsTeam_" + tname));
+                var team = mkws.teams[tname];
+                team.queue("resize" + to).publish();
+		$(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-" + to + ".mkwsTeam_" + tname));
 		for(var i = 0; i < list.length; i++) {
-		    $("." + list[i] + ".mkwsTeam_" + tname).show();
+                    var widget = team.widget(list[i]);
+                    if (widget) $(widget.node)[method]();
 		}
 	    }
 	}
-
-        mkws.width = width;
     };
 
 
@@ -432,7 +423,7 @@ mkws.pagerNext = function(tname) {
                 myTeam.addWidget(myWidget);
                 var newHTML = this.innerHTML;
                 if (newHTML !== oldHTML) {
-                    log("widget " + tname + ":" + type + " HTML changed from '" + oldHTML + "' to '" + newHTML + "': reparse!");
+                    log("widget " + tname + ":" + type + " HTML changed: reparsing");
                     makeWidgetsWithin(level+1, $(this));
                 }
             });
@@ -512,15 +503,15 @@ mkws.pagerNext = function(tname) {
 	var now = $.now();
 	log("Walking MKWS nodes took " + (now-then) + " ms");
 
-//        for (var tName in mkws.teams) {
-//            var myTeam = mkws.teams[tName]
-//            var types = myTeam.widgetTypes();
-//            log("TEAM '" + tName + "' = " + myTeam + " has widget types " + types);
-//            for (var i = 0; i < types.length; i++) {
-//                var type = types[i];
-//                log("  has widget of type '" + type + "': " + myTeam.widget(type));
-//            }
-//        }
+        /*
+        for (var tName in mkws.teams) {
+            var myTeam = mkws.teams[tName]
+            log("TEAM '" + tName + "' = " + myTeam + " ...");
+            myTeam.visitWidgets(function(t, w) {
+                log("  has widget of type '" + t + "': " + w);
+            });
+        }
+        */
 
 	if (mkws.config.use_service_proxy) {
 	    authenticateSession(mkws.config.service_proxy_auth,