X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=ec2b4a6f1948243d3deb8fd8d987f3a88dc1683d;hb=2dfad8167ee4e5d598c589954a73334c94be72c3;hp=20eab4d5a7ae4d28da7115510dfd70943c575377;hpb=b9c5ab537a2279480f44d69eae2358086468771b;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index 20eab4d..ec2b4a6 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -330,48 +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"); - } else if (width > targetWidth) { - log("already wide"); - } else { - log("already 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; };