X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widgets.js;h=e17e7e03895410b001fd944f3442882384e45a07;hb=efb2e7adaf2d74aeb9433fedda5b03eaa3fde747;hp=98a48bde67a9f30d60e8afb2f5e193063fb60b3d;hpb=2e98f6b0b8c985dadb49d9658f22df6911b43eee;p=mkws-moved-to-github.git
diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 98a48bd..e17e7e0 100644
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -10,7 +10,7 @@ function widget($, team, type, node) {
team: team,
type: type,
node: node,
- config: Object.create(team.config())
+ config: mkws.objectInheritingFrom(team.config())
};
function log(s) {
@@ -22,6 +22,10 @@ function widget($, team, type, node) {
return '[Widget ' + team.name() + ':' + type + ']';
};
+ that.value = function() {
+ return node.value;
+ }
+
for (var i = 0; i < node.attributes.length; i++) {
var a = node.attributes[i];
if (a.name === 'data-mkws-config') {
@@ -79,6 +83,13 @@ widget.autosearch = function(widget) {
if (!query) {
alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
}
+ } else if (query.match(/^!var!/)) {
+ var name = query.replace(/^!var!/, '');
+ query = window[name]; // It's ridiculous that this works
+ widget.log("obtained query '" + query + "' from variable '" + name + "'");
+ if (!query) {
+ alert("This page has a MasterKey widget that needs a query specified by the '" + name + "' variable");
+ }
}
var sortOrder = widget.config.sort;
@@ -114,6 +125,12 @@ mkws.registerWidgetType('Targets', function() {
var that = this;
var M = mkws.M;
+ $(this.node).html('\
+
\
+No information available yet.\
+
');
+ $(this.node).css("display", "none");
+
this.team.queue("targets").subscribe(function(data) {
var table ='
' +
'
' + M('Target ID') + '
' +
@@ -154,73 +171,6 @@ mkws.registerWidgetType('Stat', function() {
});
-mkws.registerWidgetType('Termlists', function() {
- var that = this;
- var M = mkws.M;
-
- this.team.queue("termlists").subscribe(function(data) {
- if (!that.node) {
- alert("termlists event when there are no termlists");
- return;
- }
-
- // no facets: this should never happen
- var facets = that.config.facets;
- if (!facets || facets.length == 0) {
- alert("onTerm called even though we have no facets: " + $.toJSON(data));
- $(that.node).hide();
- return;
- }
-
- // display if we first got results
- $(that.node).show();
-
- var acc = [];
- acc.push('