X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fhtdocs%2Fmkws.js;h=8fc2d897589137a4d38484f90a8085026b889894;hb=788954be61eb460e03e9c409a42a22c7198b84a5;hp=023f7f80c2680cc978987ce20ff8c0dd747689e3;hpb=63454ba4cd4c51013bf30d40be063d51b86d8c30;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 023f7f8..8fc2d89 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -66,18 +66,11 @@ Handlebars.registerHelper('commaList', function(items, options) {
-// Some functions are visible to be called from outside code, namely
-// generated HTML: that.switchView(), showDetails(), limitTarget(),
-// limitQuery(), delimitTarget(), delimitQuery(), pagerPrev(),
-// pagerNext(), showPage(). Also mkws.M() is made available for the
-// Handlebars helper 'translate'
-
-
-// Set up global mkws object. Contains a hash of team objects,
-// indexed by windowid.
+// Set up global mkws object. Contains truly global state such as SP
+// authentication, and a hash of team objects, indexed by windowid.
+//
var mkws = {
authenticated: false,
- debug_function: undefined, // will be set during initialisation
debug_level: undefined, // will be initialised from mkws_config
paz: undefined, // will be set up during initialisation
teams: {},
@@ -149,7 +142,15 @@ if (mkws_config == null || typeof mkws_config != 'object') {
}
-// wrapper for jQuery lib
+// Factory function for team objects. As much as possible, this uses
+// only member variables (prefixed "m_") and inner functions with
+// private scope. Some functions are visibl as member-functions to be
+// called from outside code -- specifically, from generated
+// HTML. These functions are that.switchView(), showDetails(),
+// limitTarget(), limitQuery(), delimitTarget(), delimitQuery(),
+// pagerPrev(), pagerNext(), showPage(). Also mkws.M() is made
+// available for the Handlebars helper 'translate'
+//
function team($, teamName) {
var that = {};
var m_teamName = teamName;
@@ -170,33 +171,14 @@ function team($, teamName) {
var m_paz; // will be initialised below
- // if (console && console.log) // disabled, will fail in IE8
- // console.log("run team(" + (teamName ? teamName : "") + ")");
-
-
- // Needs to be defined inside team() so it can see m_debug_time
- // ### member access won't work: there is only one instance of this function
- mkws.debug_function = function (string) {
- if (!mkws.debug_level)
- return;
-
- if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
- return;
- }
-
+ var debug = function (s) {
var now = $.now();
var timestamp = ((now - m_debug_time.start)/1000).toFixed(3) + " (+" + ((now - m_debug_time.last)/1000).toFixed(3) + ") "
m_debug_time.last = now;
- // you need to disable use strict at the top of the file!!!
- if (mkws.debug_level >= 3) {
- console.log(timestamp + arguments.callee.caller);
- } else if (mkws.debug_level >= 2) {
- console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<');
- }
- console.log(m_teamName + ": " + timestamp + string);
+ mkws.debug(m_teamName + ": " + timestamp + s);
}
- var debug = mkws.debug_function; // local alias
+
debug("start running MKWS");
m_sort = mkws_config.sort_default;
@@ -452,7 +434,7 @@ function team($, teamName) {
m_filters = []
redraw_navi();
- resetPage(); // ### the globals it resents should be indexed by windowid
+ resetPage();
loadSelect();
triggerSearch(query, sort, targets, windowid);
that.switchView('records'); // In case it's configured to start off as hidden
@@ -660,7 +642,7 @@ function team($, teamName) {
var prev = '<< ' + M('Prev') + ' | ';
if (m_curPage > 1)
- prev = ''
+ prev = ''
+'<< ' + M('Prev') + ' | ';
var middle = '';
@@ -675,7 +657,7 @@ function team($, teamName) {
var next = ' | ' + M('Next') + ' >>';
if (pages - m_curPage > 0)
- next = ' | '
+ next = ' | '
+ M('Next') + ' >>';
var predots = '';
@@ -701,7 +683,7 @@ function team($, teamName) {
// simple paging functions
- mkws.pagerNext = function () {
+ that.pagerNext = function () {
if (m_totalRec - m_perpage*m_curPage > 0) {
m_paz.showNext();
m_curPage++;
@@ -709,7 +691,7 @@ function team($, teamName) {
}
- mkws.pagerPrev = function () {
+ that.pagerPrev = function () {
if (m_paz.showPrev() != false)
m_curPage--;
}
@@ -1134,16 +1116,8 @@ function team($, teamName) {
* implement jQuery plugin $.pazpar2({})
*/
function _mkws_jquery_plugin ($) {
- var debug_level = 1;
-
function debug (string) {
- if (!debug_level)
- return;
-
- if (typeof console === "undefined" || typeof console.log === "undefined")
- return;
-
- console.log("jquery.pazpar2: " + string);
+ mkws.debug("jquery.pazpar2: " + string);
}
function init_popup(obj) {
@@ -1275,12 +1249,24 @@ function _mkws_jquery_plugin ($) {
// wrapper to call team() after page load
(function (j) {
- function log(s) {
- if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
- return;
- }
- console.log(s);
+ mkws.debug = function (string) {
+ if (!mkws.debug_level)
+ return;
+
+ if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
+ return;
+ }
+
+ // you need to disable use strict at the top of the file!!!
+ if (mkws.debug_level >= 3) {
+ console.log(arguments.callee.caller);
+ } else if (mkws.debug_level >= 2) {
+ console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
+ }
+ console.log(string);
}
+ var debug = mkws.debug;
+
// enable before page load, so we could call it before mkws() runs
_mkws_jquery_plugin(j);
@@ -1308,7 +1294,7 @@ function _mkws_jquery_plugin ($) {
if ($(window).width() <= width &&
parent.hasClass("mkwsTermlistContainer1")) {
- log("changing from wide to narrow: " + $(window).width());
+ debug("changing from wide to narrow: " + $(window).width());
$(".mkwsTermlistContainer1").hide();
$(".mkwsTermlistContainer2").show();
for (var tname in mkws.teams) {
@@ -1319,7 +1305,7 @@ function _mkws_jquery_plugin ($) {
}
} else if ($(window).width() > width &&
parent.hasClass("mkwsTermlistContainer2")) {
- log("changing from narrow to wide: " + $(window).width());
+ debug("changing from narrow to wide: " + $(window).width());
$(".mkwsTermlistContainer1").show();
$(".mkwsTermlistContainer2").hide();
for (var tname in mkws.teams) {
@@ -1360,6 +1346,15 @@ function _mkws_jquery_plugin ($) {
mkws.teams[tname].showPage(pageNum);
}
+ mkws.pagerPrev = function (tname) {
+ mkws.teams[tname].pagerPrev();
+ }
+
+ mkws.pagerNext = function (tname) {
+ mkws.teams[tname].pagerNext();
+ }
+
+
function default_mkws_config() {
/* default mkws config */
var config_default = {
@@ -1411,11 +1406,11 @@ function _mkws_jquery_plugin ($) {
* for the site.
*/
function authenticate_session(auth_url, auth_domain, pp2_url) {
- log("Run service proxy auth URL: " + auth_url);
+ debug("Run service proxy auth URL: " + auth_url);
if (!auth_domain) {
auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2');
- log("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
+ debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
}
var request = new pzHttpRequest(auth_url, function(err) {
@@ -1434,7 +1429,7 @@ function _mkws_jquery_plugin ($) {
return;
}
- log("Service proxy auth successfully done");
+ debug("Service proxy auth successfully done");
mkws.authenticated = true;
run_auto_searches();
});
@@ -1442,13 +1437,13 @@ function _mkws_jquery_plugin ($) {
function run_auto_searches() {
- log("running auto searches");
+ debug("running auto searches");
for (var teamName in mkws.teams) {
// ### should check mkwsTermlist as well, for facet-only teams
var node = $('.mkwsRecords.mkwsTeam_' + teamName);
var query = node.attr('autosearch');
- log("teamName '" + teamName + "', node=" + node + ", class='" + node.className + "', query=" + query);
+ debug("teamName '" + teamName + "', node=" + node + ", class='" + node.className + "', query=" + query);
if (query) {
var sort = node.attr('sort');
@@ -1457,9 +1452,9 @@ function _mkws_jquery_plugin ($) {
if (teamName) s += " [teamName '" + teamName + "']";
if (sort) s += " sorted by '" + sort + "'";
if (targets) s += " in targets '" + targets + "'";
- log(s);
+ debug(s);
var team = mkws.teams[teamName];
- log($.toJSON(team));
+ debug($.toJSON(team));
team.newSearch(query, sort, targets, teamName);
}
}
@@ -1467,7 +1462,7 @@ function _mkws_jquery_plugin ($) {
$(document).ready(function() {
- log("on load ready");
+ debug("on load ready");
default_mkws_config();
// Backwards compatibility: set new magic class names on any
@@ -1480,7 +1475,7 @@ function _mkws_jquery_plugin ($) {
var node = $('#' + id);
if (node.attr('id')) {
node.addClass(id);
- log("added magic class to '" + node.attr('id') + "'");
+ debug("added magic class to '" + node.attr('id') + "'");
}
}
@@ -1488,7 +1483,7 @@ function _mkws_jquery_plugin ($) {
// specified, set the team to AUTO.
$('[class^="mkws"],[class*=" mkws"]').each(function () {
if (!this.className.match(/mkwsTeam_/)) {
- log("adding AUTO team to node with class '" + this.className + "'");
+ debug("adding AUTO team to node with class '" + this.className + "'");
$(this).addClass('mkwsTeam_AUTO');
}
});
@@ -1500,7 +1495,7 @@ function _mkws_jquery_plugin ($) {
mkws.handle_node_with_team(node, function(tname) {
if (!mkws.teams[tname]) {
mkws.teams[tname] = team(j, tname);
- log("Made MKWS team '" + tname + "'");
+ debug("Made MKWS team '" + tname + "'");
}
});
});