X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=7d5128e3493ca116d65fe5fae7220ee266742ab5;hb=1e59ea3b6c29afeaf938fdb47729d2ec5f2cf7fc;hp=1ff2f2e10be835c1a25427e5467b813dfb4bdbe8;hpb=823cea5b1fc8a51b818e2a3a7784aac0c94447e7;p=mkws-moved-to-github.git
diff --git a/src/mkws-core.js b/src/mkws-core.js
index 1ff2f2e..7d5128e 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -169,7 +169,7 @@ mkws.defaultTemplate = function(name) {
return '\
\
\
- {{translate "Title"}} | \
+ {{mkws-translate "Title"}} | \
\
{{md-title}}\
{{#if md-title-remainder}}\
@@ -182,44 +182,44 @@ mkws.defaultTemplate = function(name) {
|
\
{{#if md-date}}\
\
- {{translate "Date"}} | \
+ {{mkws-translate "Date"}} | \
{{md-date}} | \
\
{{/if}}\
{{#if md-author}}\
\
- {{translate "Author"}} | \
+ {{mkws-translate "Author"}} | \
{{md-author}} | \
\
{{/if}}\
{{#if md-electronic-url}}\
\
- {{translate "Links"}} | \
+ {{mkws-translate "Links"}} | \
\
{{#each md-electronic-url}}\
- Link{{index1}}\
+ Link{{mkws-index1}}\
{{/each}}\
| \
\
{{/if}}\
- {{#if-any location having="md-subject"}}\
+ {{#mkws-if-any location having="md-subject"}}\
\
- {{translate "Subject"}} | \
+ {{mkws-translate "Subject"}} | \
\
- {{#first location having="md-subject"}}\
+ {{#mkws-first location having="md-subject"}}\
{{#if md-subject}}\
- {{#commaList md-subject}}\
- {{this}}{{/commaList}}\
+ {{#mkws-commaList md-subject}}\
+ {{this}}{{/mkws-commaList}}\
{{/if}}\
- {{/first}}\
+ {{/mkws-first}}\
| \
\
- {{/if-any}}\
+ {{/mkws-if-any}}\
\
- {{translate "Locations"}} | \
+ {{mkws-translate "Locations"}} | \
\
- {{#commaList location}}\
- {{attr "@name"}}{{/commaList}}\
+ {{#mkws-commaList location}}\
+ {{mkws-attr "@name"}}{{/mkws-commaList}}\
| \
\
\
@@ -239,9 +239,9 @@ mkws.defaultTemplate = function(name) {
} else if (name === "Image") {
return '\
\
- {{#first md-thumburl}}\
+ {{#mkws-first md-thumburl}}\
\
- {{/first}}\
+ {{/mkws-first}}\
\
\
';
@@ -330,32 +330,35 @@ mkws.pagerNext = function(tname) {
function resizePage() {
- var list = ["Switch", "Lang"];
-
var threshhold = mkws.config.responsive_design_width;
var width = $(window).width();
var from, to, method;
- if (mkws.width === undefined) {
- // No state change, since we have no previous state
- } else if (mkws.width > threshhold && width <= threshhold) {
+ if ((mkws.width === undefined || mkws.width > threshhold) &&
+ width <= threshhold) {
from = "wide"; to = "narrow"; method = "hide";
- } else if (mkws.width <= threshhold && width > threshhold) {
+ } else if ((mkws.width === undefined || mkws.width <= threshhold) &&
+ width > threshhold) {
from = "narrow"; to = "wide"; method = "show";
}
mkws.width = width;
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" + to).publish();
- $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-" + to + ".mkwsTeam_" + tname));
- for(var i = 0; i < list.length; i++) {
- var widget = mkws.teams[tname].widget(list[i]);
- if (widget) $(widget.node)[method]();
- }
+ var team = mkws.teams[tname];
+ team.visitWidgets(function (t, w) {
+ var w1 = team.widget(t + "-Container-" + from);
+ var w2 = team.widget(t + "-Container-" + to);
+ if (w1) {
+ $(w1.node).hide();
+ }
+ if (w2) {
+ $(w2.node).show();
+ $(w.node).appendTo($(w2.node));
+ }
+ });
+ team.queue("resize-" + to).publish();
}
}
};
@@ -422,7 +425,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));
}
});
@@ -502,15 +505,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,