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' into urlstate
[mkws-moved-to-github.git]
/
src
/
mkws-widget-main.js
diff --git
a/src/mkws-widget-main.js
b/src/mkws-widget-main.js
index
f1b13e0
..
355d8d7
100644
(file)
--- a/
src/mkws-widget-main.js
+++ b/
src/mkws-widget-main.js
@@
-73,19
+73,19
@@
mkws.registerWidgetType('pager', function() {
if (firstClkbl > 1) output.morePrev = true;
if (lastClkbl < pages) output.moreNext = true;
if (firstClkbl > 1) output.morePrev = true;
if (lastClkbl < pages) output.moreNext = true;
- if (currentPage > 1) output.prevClick = "mkws.pagerPrev(\'" + teamName + "\');";
+ if (currentPage > 1) output.prevHref = '#' + that.team.urlFragment({ page: currentPage-1 });
output.pages = [];
for(var i = firstClkbl; i <= lastClkbl; i++) {
var o = {};
o.number = i;
if (i !== currentPage) {
output.pages = [];
for(var i = firstClkbl; i <= lastClkbl; i++) {
var o = {};
o.number = i;
if (i !== currentPage) {
- o.click = "mkws.showPage(\'" + teamName + "\', " + i + ");";
+ o.href = '#' + that.team.urlFragment({ page: i });
}
output.pages.push(o);
}
}
output.pages.push(o);
}
- if (pages - currentPage > 0) output.nextClick = "mkws.pagerNext(\'" + teamName + "\')";
+ if (pages - currentPage > 0) output.nextHref = '#' + that.team.urlFragment({ page: currentPage+1 });
var template = that.team.loadTemplate(that.config.template || "pager");
that.node.html(template(output));
var template = that.team.loadTemplate(that.config.template || "pager");
that.node.html(template(output));
@@
-121,6
+121,7
@@
mkws.registerWidgetType('records', function() {
var m_dataToRedraw = null;
function refreshRecordData() {
var m_dataToRedraw = null;
function refreshRecordData() {
+ that.node.stop();
that.node.css('opacity', 1);
if (m_dataToRedraw) {
that.node.css('opacity', 1);
if (m_dataToRedraw) {
@@
-231,10
+232,7
@@
mkws.registerWidgetType('sort', function() {
var that = this;
this.node.change(function() {
var that = this;
this.node.change(function() {
- that.team.set_sortOrder(that.node.val());
- if (that.team.submitted()) {
- that.team.reShow();
- }
+ window.location.href = '#' + that.team.urlFragment({ sort: that.node.val() });
return false;
});
});
return false;
});
});
@@
-244,10
+242,7
@@
mkws.registerWidgetType('per-page', function() {
var that = this;
this.node.change(function() {
var that = this;
this.node.change(function() {
- that.team.set_perpage(that.node.val());
- if (that.team.submitted()) {
- that.team.reShow();
- }
+ window.location.href = '#' + that.team.urlFragment({ size: that.node.val() });
return false;
});
});
return false;
});
});