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
Fix comment.
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
mkws.js
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
2e0c5fd
..
396a2a9
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-72,7
+72,7
@@
Handlebars.registerHelper('index1', function(obj) {
// Set up global mkws object. Contains truly global state such as SP
// Set up global mkws object. Contains truly global state such as SP
-// authentication, and a hash of team objects, indexed by windowid.
+// authentication, and a hash of team objects, indexed by team-name.
//
var mkws = {
authenticated: false,
//
var mkws = {
authenticated: false,
@@
-448,21
+448,15
@@
function team($, teamName) {
// when search button pressed
// when search button pressed
- // ### This is closure, so can always just operate on its own team
function onFormSubmitEventHandler()
{
function onFormSubmitEventHandler()
{
- mkws.handle_node_with_team(this, function (tname) {
- var val = findnode('.mkwsQuery').val();
- mkws.teams[tname].newSearch(val);
- });
-
+ var val = findnode('.mkwsQuery').val();
+ newSearch(val);
return false;
}
return false;
}
- // ### won't need to be externally visible once onFormSubmitEventHandler() is fixed.
- // ### doesn't need windowid
- that.newSearch = function(query, sort, targets, windowid)
+ function newSearch(query, sort, targets)
{
debug("newSearch: " + query);
{
debug("newSearch: " + query);
@@
-475,8
+469,8
@@
function team($, teamName) {
redraw_navi();
resetPage();
loadSelect();
redraw_navi();
resetPage();
loadSelect();
- triggerSearch(query, sort, targets, windowid);
- that.switchView('records'); // In case it's configured to start off as hidden
+ triggerSearch(query, sort, targets);
+ switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
}
m_submitted = true;
}
@@
-498,8
+492,7
@@
function team($, teamName) {
}
}
- // ### doesn't need windowid
- function triggerSearch (query, sort, targets, windowid)
+ function triggerSearch (query, sort, targets)
{
var pp2filter = "";
var pp2limit = "";
{
var pp2filter = "";
var pp2limit = "";
@@
-538,9
+531,7
@@
function team($, teamName) {
if (pp2limit) {
params.limit = pp2limit;
}
if (pp2limit) {
params.limit = pp2limit;
}
- if (windowid) {
- params.windowid = windowid;
- }
+
debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
// We can use: params.torusquery = "udb=NAME"
debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
// We can use: params.torusquery = "udb=NAME"
@@
-740,7
+731,7
@@
function team($, teamName) {
// switching view between targets and records
// switching view between targets and records
- that.switchView = function(view) {
+ function switchView(view) {
var targets = findnode('.mkwsTargets');
var results = findnode('.mkwsResults,.mkwsRecords');
var blanket = findnode('.mkwsBlanket');
var targets = findnode('.mkwsTargets');
var results = findnode('.mkwsResults,.mkwsRecords');
var blanket = findnode('.mkwsBlanket');
@@
-772,6
+763,9
@@
function team($, teamName) {
}
}
+ that.switchView = switchView;
+
+
// detailed record drawing
that.showDetails = function (prefixRecId) {
var recId = prefixRecId.replace('mkwsRec_', '');
// detailed record drawing
that.showDetails = function (prefixRecId) {
var recId = prefixRecId.replace('mkwsRec_', '');
@@
-1169,7
+1163,7
@@
function team($, teamName) {
if (targets) s += " in targets '" + targets + "'";
debug(s);
if (targets) s += " in targets '" + targets + "'";
debug(s);
- this.newSearch(query, sort, targets, m_teamName);
+ newSearch(query, sort, targets);
}
}