projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow string based values for comboboxarray
[roojs1]
/
Roo
/
PagingToolbar.js
diff --git
a/Roo/PagingToolbar.js
b/Roo/PagingToolbar.js
index
55b8cc3
..
dd1f615
100644
(file)
--- a/
Roo/PagingToolbar.js
+++ b/
Roo/PagingToolbar.js
@@
-27,9
+27,9
@@
Roo.PagingToolbar = function(el, ds, config)
el = config.container;
}
var items = [];
el = config.container;
}
var items = [];
- if (
this
.items) {
- items =
this
.items;
-
this
.items = [];
+ if (
config
.items) {
+ items =
config
.items;
+
config
.items = [];
}
Roo.PagingToolbar.superclass.constructor.call(this, el, null, config);
}
Roo.PagingToolbar.superclass.constructor.call(this, el, null, config);
@@
-37,10
+37,12
@@
Roo.PagingToolbar = function(el, ds, config)
this.cursor = 0;
this.renderButtons(this.el);
this.bind(ds);
this.cursor = 0;
this.renderButtons(this.el);
this.bind(ds);
- var _this = this;
+
+ // supprot items array.
+
Roo.each(items, function(e) {
Roo.each(items, function(e) {
-
_
this.add(Roo.factory(e));
- });
+ this.add(Roo.factory(e));
+ }
,this
);
};
};
@@
-230,8
+232,9
@@
Roo.extend(Roo.PagingToolbar, Roo.Toolbar, {
{
var v = this.field.dom.value, pageNum;
var increment = (e.shiftKey) ? 10 : 1;
{
var v = this.field.dom.value, pageNum;
var increment = (e.shiftKey) ? 10 : 1;
- if(k == e.DOWN || k == e.LEFT || k == e.PAGEDOWN)
+ if(k == e.DOWN || k == e.LEFT || k == e.PAGEDOWN)
{
increment *= -1;
increment *= -1;
+ }
if(!v || isNaN(pageNum = parseInt(v, 10))) {
this.field.dom.value = d.activePage;
return;
if(!v || isNaN(pageNum = parseInt(v, 10))) {
this.field.dom.value = d.activePage;
return;