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
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
[mkws-moved-to-github.git]
/
src
/
mkws-widgets.js
diff --git
a/src/mkws-widgets.js
b/src/mkws-widgets.js
index
39e0816
..
17ecdab
100644
(file)
--- a/
src/mkws-widgets.js
+++ b/
src/mkws-widgets.js
@@
-2,7
+2,7
@@
function widget($, team, type, node) {
// Static register of attributes that do not contribute to config
var ignoreAttrs = {
function widget($, team, type, node) {
// Static register of attributes that do not contribute to config
var ignoreAttrs = {
- id:1, class:1, style:1, name:1, action:1, type:1, size:1,
+ id:1, 'class':1, style:1, name:1, action:1, type:1, size:1,
value:1, width:1, valign:1
};
value:1, width:1, valign:1
};
@@
-257,8
+257,7
@@
mkws.registerWidgetType('Records', function() {
}
$(that.node).html(html.join(''));
}
$(that.node).html(html.join(''));
- function renderSummary(hit)
- {
+ function renderSummary(hit) {
var template = team.loadTemplate("Summary");
hit._id = team.recordElementId(hit.recid[0]);
hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
var template = team.loadTemplate("Summary");
hit._id = team.recordElementId(hit.recid[0]);
hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
@@
-266,12
+265,11
@@
mkws.registerWidgetType('Records', function() {
}
});
}
});
- var node = $(that.node);
- var query = node.attr('autosearch');
+ var query = that.config.autosearch;
if (query) {
if (query.match(/^!param!/)) {
var param = query.replace(/^!param!/, '');
if (query) {
if (query.match(/^!param!/)) {
var param = query.replace(/^!param!/, '');
- query = getParameterByName(param);
+ query = mkws.getParameterByName(param);
that.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");
that.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");
@@
-285,17
+283,21
@@
mkws.registerWidgetType('Records', function() {
alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
}
}
alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
}
}
- that.log("node=" + node + ", class='" + node.className + "', query=" + query);
this.team.queue("ready").subscribe(function() {
this.team.queue("ready").subscribe(function() {
- var sortOrder = node.attr('sort');
- var targets = node.attr('targets');
+ var sortOrder = that.config.sort;
+ var perpage = that.config.perpage;
+ var targets = that.config.targets;
+ var torusquery = that.config.torusquery;
+ that.log("torusquery='" + torusquery + "'");
var s = "running auto search: '" + query + "'";
if (sortOrder) s += " sorted by '" + sortOrder + "'";
var s = "running auto search: '" + query + "'";
if (sortOrder) s += " sorted by '" + sortOrder + "'";
+ if (perpage) s += " with " + perpage + " per page";
if (targets) s += " in targets '" + targets + "'";
if (targets) s += " in targets '" + targets + "'";
+ if (torusquery) s += " limited by torusquery '" + torusquery + "'";
that.log(s);
that.log(s);
- that.team.newSearch(query, sortOrder, targets);
+ that.team.newSearch(query, sortOrder, perpage, targets, torusquery);
});
}
});
});
}
});