X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widgets.js;h=e17e7e03895410b001fd944f3442882384e45a07;hb=efb2e7adaf2d74aeb9433fedda5b03eaa3fde747;hp=bb529bfecd06e3c663fb8d17451112345a4e8ae0;hpb=7bf5eb4799d8f01f1a6038e9137eb0aa05d02d6c;p=mkws-moved-to-github.git
diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index bb529bf..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') {
@@ -61,32 +65,42 @@ function widget($, team, type, node) {
// Utility function for use by all widgets that can invoke autosearch.
widget.autosearch = function(widget) {
- var query = widget.config.autosearch;
- if (query) {
- if (query.match(/^!param!/)) {
- var param = query.replace(/^!param!/, '');
- query = mkws.getParameterByName(param);
- widget.log("obtained query '" + query + "' from param '" + param + "'");
- if (!query) {
- alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
- }
- } else if (query.match(/^!path!/)) {
- var index = query.replace(/^!path!/, '');
- var path = window.location.pathname.split('/');
- query = path[path.length - index];
- widget.log("obtained query '" + query + "' from path-component '" + index + "'");
- if (!query) {
- alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
+ widget.team.queue("ready").subscribe(function() {
+ var query = widget.config.autosearch;
+ if (query) {
+ if (query.match(/^!param!/)) {
+ var param = query.replace(/^!param!/, '');
+ query = mkws.getParameterByName(param);
+ widget.log("obtained query '" + query + "' from param '" + param + "'");
+ if (!query) {
+ alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
+ }
+ } else if (query.match(/^!path!/)) {
+ var index = query.replace(/^!path!/, '');
+ var path = window.location.pathname.split('/');
+ query = path[path.length - index];
+ widget.log("obtained query '" + query + "' from path-component '" + index + "'");
+ 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");
+ }
}
- }
- widget.team.queue("ready").subscribe(function() {
var sortOrder = widget.config.sort;
var maxrecs = widget.config.maxrecs;
var perpage = widget.config.perpage;
var limit = widget.config.limit;
var targets = widget.config.targets;
var targetfilter = widget.config.targetfilter;
+ var target = widget.config.target;
+ if (target) targetfilter = 'udb=="' + target + '"';
+
var s = "running auto search: '" + query + "'";
if (sortOrder) s += " sorted by '" + sortOrder + "'";
if (maxrecs) s += " restricted to " + maxrecs + " records";
@@ -97,8 +111,8 @@ widget.autosearch = function(widget) {
widget.log(s);
widget.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
- });
- }
+ }
+ });
};
@@ -111,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') + '
' +
@@ -151,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('