projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
82025a1
)
Roo/bootstrap/Card.js
author
Alan Knowles
<alan@roojs.com>
Mon, 16 Nov 2020 07:43:46 +0000
(15:43 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 16 Nov 2020 07:43:46 +0000
(15:43 +0800)
Roo/bootstrap/Card.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Card.js
b/Roo/bootstrap/Card.js
index
bf8f192
..
e156c08
100644
(file)
--- a/
Roo/bootstrap/Card.js
+++ b/
Roo/bootstrap/Card.js
@@
-397,6
+397,7
@@
Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, {
var cards = [];
//Roo.log(this.items.length);
var lpos = pos = cpos = false;
var cards = [];
//Roo.log(this.items.length);
var lpos = pos = cpos = false;
+ var last_card_pos = 0;
for (var i = 0;i< this.items.length;i++) {
if (!this.items[i].el.hasClass('card')) {
for (var i = 0;i< this.items.length;i++) {
if (!this.items[i].el.hasClass('card')) {
@@
-405,12
+406,11
@@
Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, {
pos = this.getDropPoint(e, this.items[i].el.dom);
//Roo.log(this.items[i].el.dom.id);
pos = this.getDropPoint(e, this.items[i].el.dom);
//Roo.log(this.items[i].el.dom.id);
- var ii = cards.length;
cards.push(this.items[i]);
cards.push(this.items[i]);
-
+ last_card_pos = i;
if (ctarget < 0 && pos == 'above') {
if (ctarget < 0 && pos == 'above') {
-
ctarget = ii > 0 ? i
i - 1 : 0;
- cpos = i
i
> 0 ? 'below' : pos;
+
items_pos = i > 0 ?
i - 1 : 0;
+ cpos = i > 0 ? 'below' : pos;
}
}
if (!cards.length) {
}
}
if (!cards.length) {
@@
-418,7
+418,7
@@
Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, {
}
if (ctarget < 0) {
}
if (ctarget < 0) {
- ctarget =
cards.length -1;
+ ctarget =
last_card_pos
cpos = 'below';
}
if (cards[ctarget].el == dragged_card_el) {
cpos = 'below';
}
if (cards[ctarget].el == dragged_card_el) {