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
All five members of the mkws global hash are now explicitly initialised.
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
mkws.js
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
9893577
..
f322382
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-11,7
+11,10
@@
// indexed by windowid.
var mkws = {
authenticated: false,
// indexed by windowid.
var mkws = {
authenticated: false,
- sessions: {}
+ init: false,
+ debug_function: undefined, // will be set during initialisation
+ debug_level: undefined, // will be initialised from mkws_config
+ sessions: {},
};
mkws.locale_lang = {
};
mkws.locale_lang = {
@@
-273,6
+276,7
@@
function _make_mkws_team($, teamName) {
var SourceMax = 16;
var SubjectMax = 10;
var AuthorMax = 10;
var SourceMax = 16;
var SubjectMax = 10;
var AuthorMax = 10;
+ var m_query; // initially undefined
if (!isNaN(parseInt(mkws_config.perpage_default))) {
recPerPage = parseInt(mkws_config.perpage_default);
if (!isNaN(parseInt(mkws_config.perpage_default))) {
recPerPage = parseInt(mkws_config.perpage_default);
@@
-491,7
+495,7
@@
function _make_mkws_team($, teamName) {
// Re-use previous query/sort if new ones are not specified
if (query) {
// Re-use previous query/sort if new ones are not specified
if (query) {
- mkws.query = query;
+ m_query = query;
}
if (sort) {
m_sort = sort;
}
if (sort) {
m_sort = sort;
@@
-526,9
+530,9
@@
function _make_mkws_team($, teamName) {
if (windowid) {
params.windowid = windowid;
}
if (windowid) {
params.windowid = windowid;
}
- debug("triggerSearch(" + mkws.query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
+ debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
- m_paz.search(mkws.query, recPerPage, m_sort, pp2filter, undefined, params);
+ m_paz.search(m_query, recPerPage, m_sort, pp2filter, undefined, params);
}
function loadSelect ()
}
function loadSelect ()