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
stat event-queueing is per-team.
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
mkws.js
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
796fd2c
..
ee05520
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-186,15
+186,15
@@
function widget($, team, type, node) {
} else if (type === 'Stat') {
promoteStat();
} else {
} else if (type === 'Stat') {
promoteStat();
} else {
- // Unsupported widget type: call an extension?
+ // ### Handle other types here
}
}
- // ### More to do here, surely: e.g. wiring into the team
mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
+ return that;
function promoteTargets() {
function promoteTargets() {
- mkws.queue("targets").subscribe(function(data) {
+ mkws.queue("targets." + team.name()).subscribe(function(data) {
if (node.length === 0) alert("huh?!");
var table ='<table><thead><tr>' +
if (node.length === 0) alert("huh?!");
var table ='<table><thead><tr>' +
@@
-221,7
+221,7
@@
function widget($, team, type, node) {
function promoteStat() {
function promoteStat() {
- mkws.queue("stat").subscribe(function(data) {
+ mkws.queue("stat." + team.name()).subscribe(function(data) {
if (node.length === 0) alert("huh?!");
$(node).html('<span class="head">' + M('Status info') + '</span>' +
if (node.length === 0) alert("huh?!");
$(node).html('<span class="head">' + M('Status info') + '</span>' +
@@
-231,9
+231,6
@@
function widget($, team, type, node) {
'<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
});
}
'<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
});
}
-
-
- return that;
}
}
@@
-248,6
+245,7
@@
function widget($, team, type, node) {
function team($, teamName) {
var that = {};
var m_teamName = teamName;
function team($, teamName) {
var that = {};
var m_teamName = teamName;
+ that.name = function() { return m_teamName; }
var m_submitted = false;
var m_query; // initially undefined
var m_sort; // will be set below
var m_submitted = false;
var m_query; // initially undefined
var m_sort; // will be set below
@@
-309,13
+307,13
@@
function team($, teamName) {
function onBytarget(data) {
debug("target");
function onBytarget(data) {
debug("target");
- mkws.queue("targets").publish(data);
+ mkws.queue("targets." + m_teamName).publish(data);
}
function onStat(data) {
debug("stat");
}
function onStat(data) {
debug("stat");
- mkws.queue("stat").publish(data);
+ mkws.queue("stat." + m_teamName).publish(data);
}
}