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
team.filters returns the filterSet object, not its list.
[mkws-moved-to-github.git]
/
src
/
mkws-widgets.js
diff --git
a/src/mkws-widgets.js
b/src/mkws-widgets.js
index
6370952
..
c04c3f9
100644
(file)
--- a/
src/mkws-widgets.js
+++ b/
src/mkws-widgets.js
@@
-22,6
+22,10
@@
function widget($, team, type, node) {
return '[Widget ' + team.name() + ':' + type + ']';
};
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') {
for (var i = 0; i < node.attributes.length; i++) {
var a = node.attributes[i];
if (a.name === 'data-mkws-config') {
@@
-181,24
+185,24
@@
mkws.registerWidgetType('Pager', function() {
? firstClkbl + 2*onsides
: pages;
? firstClkbl + 2*onsides
: pages;
- var prev = '<span class="mkwsPrev"><< ' + M('Prev') + '</span><b> | </b>';
+ var prev = '<span class="mkwsPrev"><< ' + M('Prev') + '</span> | ';
if (currentPage > 1)
prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + teamName + '\');">'
if (currentPage > 1)
prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + teamName + '\');">'
- +'<< ' + M('Prev') + '</a><b> | </b>';
+ +'<< ' + M('Prev') + '</a> | ';
var middle = '';
for(var i = firstClkbl; i <= lastClkbl; i++) {
var numLabel = i;
if(i == currentPage)
var middle = '';
for(var i = firstClkbl; i <= lastClkbl; i++) {
var numLabel = i;
if(i == currentPage)
- numLabel = '<b>' + i + '</b>';
+ numLabel = '<span class="mkwsSelected">' + i + '</span>';
middle += '<a href="#" onclick="mkws.showPage(\'' + teamName + '\', ' + i + ')"> '
+ numLabel + ' </a>';
}
middle += '<a href="#" onclick="mkws.showPage(\'' + teamName + '\', ' + i + ')"> '
+ numLabel + ' </a>';
}
- var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' >></span>';
+ var next = ' | <span class="mkwsNext">' + M('Next') + ' >></span>';
if (pages - currentPage > 0)
if (pages - currentPage > 0)
- next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
+ next = ' | <a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
+ M('Next') + ' >></a>';
var predots = '';
+ M('Next') + ' >></a>';
var predots = '';
@@
-218,6
+222,13
@@
mkws.registerWidgetType('Pager', function() {
});
});
+mkws.registerWidgetType('Results', function() {
+ // Nothing to do apart from act as an autosearch trigger
+ // Contained elements do all the real work
+ widget.autosearch(this);
+});
+
+
mkws.registerWidgetType('Records', function() {
var that = this;
var team = this.team;
mkws.registerWidgetType('Records', function() {
var that = this;
var team = this.team;
@@
-256,18
+267,23
@@
mkws.registerWidgetType('Navi', function() {
var M = mkws.M;
this.team.queue("navi").subscribe(function() {
var M = mkws.M;
this.team.queue("navi").subscribe(function() {
+ // This is very low-level poking around inside the filter structure
var filters = that.team.filters();
var text = "";
for (var i in filters) {
var filters = that.team.filters();
var text = "";
for (var i in filters) {
- if (text) {
- text += " | ";
- }
var filter = filters[i];
if (filter.id) {
var filter = filters[i];
if (filter.id) {
+ if (text) text += " | ";
text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
"', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
"', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
- } else {
+ }
+ }
+
+ for (var i in filters) {
+ var filter = filters[i];
+ if (!filter.id) {
+ if (text) text += " | ";
text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
"', '" + filter.field + "', '" + filter.value + "'" +
');return false;">' + filter.value + '</a>';
text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
"', '" + filter.field + "', '" + filter.value + "'" +
');return false;">' + filter.value + '</a>';