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
wait longer for "source in navi bar"
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
mkws.js
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
b5dc51d
..
b735cf6
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-141,7
+141,7
@@
if (mkws_config == null || typeof mkws_config != 'object') {
// wrapper for jQuery lib
// wrapper for jQuery lib
-function _make_mkws_team($, teamName) {
+function team($, teamName) {
var that = {};
var m_teamName = teamName;
var m_submitted = false;
var that = {};
var m_teamName = teamName;
var m_submitted = false;
@@
-162,10
+162,11
@@
function _make_mkws_team($, teamName) {
// if (console && console.log) // disabled, will fail in IE8
// if (console && console.log) // disabled, will fail in IE8
- // console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
+ // console.log("run team(" + (teamName ? teamName : "") + ")");
- // Needs to be defined inside _make_mkws_team() so it can see m_debug_time
+ // 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;
mkws.debug_function = function (string) {
if (!mkws.debug_level)
return;
@@
-270,7
+271,8
@@
function _make_mkws_team($, teamName) {
renderSummary(hit),
'</div>');
if (hit.recid == m_curDetRecId) {
renderSummary(hit),
'</div>');
if (hit.recid == m_curDetRecId) {
- html.push(renderDetails(m_curDetRecData));
+ if (m_curDetRecData)
+ html.push(renderDetails(m_curDetRecData));
}
}
results.html(html.join(''));
}
}
results.html(html.join(''));
@@
-281,7
+283,7
@@
function _make_mkws_team($, teamName) {
{
var template = loadTemplate("Summary");
hit._id = "mkwsRec_" + hit.recid;
{
var template = loadTemplate("Summary");
hit._id = "mkwsRec_" + hit.recid;
- hit._onclick = "mkws.showDetails(this.id);return false;"
+ hit._onclick = "mkws.showDetails(this.id, '" + m_teamName + "');return false;"
return template(hit);
}
return template(hit);
}
@@
-355,7
+357,7
@@
function _make_mkws_team($, teamName) {
}
}
- function my_onrecord(data, teamName) {
+ function my_onrecord(data, args, teamName) {
debug("record for " + teamName);
// FIXME: record is async!!
clearTimeout(m_paz.recordTimer);
debug("record for " + teamName);
// FIXME: record is async!!
clearTimeout(m_paz.recordTimer);
@@
-404,10
+406,11
@@
function _make_mkws_team($, teamName) {
// wait until the DOM is ready
function domReady ()
{
// wait until the DOM is ready
function domReady ()
{
- $('.mkwsSearchForm').each(function (i, obj) {
+ $('.mkwsSearchForm.mkwsTeam_' + m_teamName).each(function (i, obj) {
+ debug("adding search-forms for team '" + m_teamName + "'");
var node = this;
var node = this;
- debug("adding class 'foo' to node " + node);
mkws.handle_node_with_team(node, function(tname) {
mkws.handle_node_with_team(node, function(tname) {
+ debug("adding search-form '" + tname + "' for team '" + m_teamName + "'");
$(node).submit(onFormSubmitEventHandler);
});
});
$(node).submit(onFormSubmitEventHandler);
});
});
@@
-425,7
+428,11
@@
function _make_mkws_team($, teamName) {
// when search button pressed
function onFormSubmitEventHandler()
{
// when search button pressed
function onFormSubmitEventHandler()
{
- that.newSearch(document.mkwsSearchForm.mkwsQuery.value);
+ mkws.handle_node_with_team(this, function (tname) {
+ var val = $('.mkwsQuery.mkwsTeam_' + tname).val();
+ mkws.teams[tname].newSearch(val);
+ });
+
return false;
}
return false;
}
@@
-729,7
+736,7
@@
function _make_mkws_team($, teamName) {
// detailed record drawing
// detailed record drawing
- mkws.showDetails = function (prefixRecId) {
+ that.showDetails = function (prefixRecId) {
var recId = prefixRecId.replace('mkwsRec_', '');
var oldRecId = m_curDetRecId;
m_curDetRecId = recId;
var recId = prefixRecId.replace('mkwsRec_', '');
var oldRecId = m_curDetRecId;
m_curDetRecId = recId;
@@
-1276,7
+1283,7
@@
function _mkws_jquery_plugin ($) {
};
};
-// wrapper to call _make_mkws_team() after page load
+// wrapper to call team() after page load
(function (j) {
function log(s) {
if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
(function (j) {
function log(s) {
if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
@@
-1315,7
+1322,7
@@
function _mkws_jquery_plugin ($) {
if (mkws.teams[tname]) {
log("MKWS team '" + tname + "' already exists, skipping");
} else {
if (mkws.teams[tname]) {
log("MKWS team '" + tname + "' already exists, skipping");
} else {
- mkws.teams[tname] = _make_mkws_team(j, tname);
+ mkws.teams[tname] = team(j, tname);
log("Made MKWS team '" + tname + "'");
}
});
log("Made MKWS team '" + tname + "'");
}
});
@@
-1348,6
+1355,11
@@
function _mkws_jquery_plugin ($) {
}
}
+ mkws.showDetails = function (prefixRecId, tname) {
+ mkws.teams[tname].showDetails(prefixRecId);
+ }
+
+
function default_mkws_config() {
/* default mkws config */
var config_default = {
function default_mkws_config() {
/* default mkws config */
var config_default = {