projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More comment.
[mkws-moved-to-github.git]
/
src
/
mkws-core.js
diff --git
a/src/mkws-core.js
b/src/mkws-core.js
index
c308554
..
61cccdc
100644
(file)
--- a/
src/mkws-core.js
+++ b/
src/mkws-core.js
@@
-13,7
+13,6
@@
var mkws = {
authenticated: false,
log_level: 1, // Will be overridden from mkws_config, but
// initial value allows jQuery popup to use logging.
authenticated: false,
log_level: 1, // Will be overridden from mkws_config, but
// initial value allows jQuery popup to use logging.
- paz: undefined, // will be set up during initialisation
teams: {},
locale_lang: {
"de": {
teams: {},
locale_lang: {
"de": {
@@
-85,7
+84,7
@@
if (mkws_config == null || typeof mkws_config != 'object') {
// wrapper to call team() after page load
(function (j) {
// wrapper to call team() after page load
(function (j) {
- mkws.log = function (string) {
+ function log(string) {
if (!mkws.log_level)
return;
if (!mkws.log_level)
return;
@@
-101,10
+100,10
@@
if (mkws_config == null || typeof mkws_config != 'object') {
}
console.log(string);
}
}
console.log(string);
}
- var log = mkws.log;
+ mkws.log = log;
- mkws.handleNodeWithTeam = function(node, callback) {
+ function handleNodeWithTeam(node, callback) {
// First branch for DOM objects; second branch for jQuery objects
var classes = node.className || node.attr('class');
if (!classes) {
// First branch for DOM objects; second branch for jQuery objects
var classes = node.className || node.attr('class');
if (!classes) {
@@
-130,7
+129,7
@@
if (mkws_config == null || typeof mkws_config != 'object') {
}
}
- mkws.resizePage = function () {
+ function resizePage() {
var list = ["mkwsSwitch", "mkwsLang"];
var width = mkws_config.responsive_design_width;
var list = ["mkwsSwitch", "mkwsLang"];
var width = mkws_config.responsive_design_width;
@@
-162,6
+161,10
@@
if (mkws_config == null || typeof mkws_config != 'object') {
};
};
+ // The following functions are dispatchers for team methods that
+ // are called from the UI using a team-name rather than implicit
+ // context. Apart from mkws.log, they are the ONLY public UI to
+ // this module.
mkws.switchView = function(tname, view) {
mkws.teams[tname].switchView(view);
}
mkws.switchView = function(tname, view) {
mkws.teams[tname].switchView(view);
}
@@
-273,7
+276,7
@@
if (mkws_config == null || typeof mkws_config != 'object') {
}
var status = $(data).find("status");
if (status.text() != "OK") {
}
var status = $(data).find("status");
if (status.text() != "OK") {
- alert("service proxy auth repsonse status: " + status.text() + ", give up!");
+ alert("service proxy auth response status: " + status.text() + ", give up!");
return;
}
return;
}
@@
-294,7
+297,6
@@
if (mkws_config == null || typeof mkws_config != 'object') {
$(document).ready(function() {
$(document).ready(function() {
- log("on load ready");
defaultMkwsConfig();
if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
defaultMkwsConfig();
if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
@@
-316,9
+318,9
@@
if (mkws_config == null || typeof mkws_config != 'object') {
if (mkws_config.responsive_design_width) {
// Responsive web design - change layout on the fly based on
// current screen width. Required for mobile devices.
if (mkws_config.responsive_design_width) {
// Responsive web design - change layout on the fly based on
// current screen width. Required for mobile devices.
- $(window).resize(function(e) { mkws.resizePage() });
+ $(window).resize(resizePage);
// initial check after page load
// initial check after page load
- $(document).ready(function() { mkws.resizePage() });
+ $(document).ready(resizePage);
}
// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
}
// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
@@
-354,7
+356,7
@@
if (mkws_config == null || typeof mkws_config != 'object') {
// the mkwsTeam_* class. Make all team objects.
var then = $.now();
$('[class^="mkws"],[class*=" mkws"]').each(function () {
// the mkwsTeam_* class. Make all team objects.
var then = $.now();
$('[class^="mkws"],[class*=" mkws"]').each(function () {
- mkws.handleNodeWithTeam(this, function(tname, type) {
+ handleNodeWithTeam(this, function(tname, type) {
if (!mkws.teams[tname]) {
mkws.teams[tname] = team(j, tname);
log("Made MKWS team '" + tname + "'");
if (!mkws.teams[tname]) {
mkws.teams[tname] = team(j, tname);
log("Made MKWS team '" + tname + "'");
@@
-366,7
+368,7
@@
if (mkws_config == null || typeof mkws_config != 'object') {
// that sometimes makes new widget nodes (e.g. creating
// mkwsTermlists inside mkwsResults.
$('[class^="mkws"],[class*=" mkws"]').each(function () {
// that sometimes makes new widget nodes (e.g. creating
// mkwsTermlists inside mkwsResults.
$('[class^="mkws"],[class*=" mkws"]').each(function () {
- mkws.handleNodeWithTeam(this, function(tname, type) {
+ handleNodeWithTeam(this, function(tname, type) {
var myTeam = mkws.teams[tname];
var myWidget = widget(j, myTeam, type, this);
});
var myTeam = mkws.teams[tname];
var myWidget = widget(j, myTeam, type, this);
});