Skip to content

Commit 4bcb887

Browse files
committed
#150: fixed 'put' as array
1 parent dcc392a commit 4bcb887

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

Sortable.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,10 @@
369369
if (!_silent &&
370370
(isOwner
371371
? canSort || (revert = !rootEl.contains(dragEl))
372-
: activeGroup.pull && activeGroup.name === group.name && groupPut && (groupPut.indexOf ? groupPut.indexOf(activeGroup.name) > -1 : groupPut)
372+
: activeGroup.pull && groupPut && (
373+
(activeGroup.name === group.name) || // by Name
374+
(groupPut.indexOf && ~groupPut.indexOf(activeGroup.name)) // by Array
375+
)
373376
) &&
374377
(evt.rootEl === void 0 || evt.rootEl === this.el)
375378
) {
@@ -439,7 +442,7 @@
439442
} else {
440443
target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
441444
}
442-
445+
443446
this._animate(dragRect, dragEl);
444447
this._animate(targetRect, target);
445448
}
@@ -803,7 +806,7 @@
803806
};
804807

805808

806-
Sortable.version = '0.7.0';
809+
Sortable.version = '0.7.1';
807810

808811

809812
/**

Sortable.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Sortable",
33
"main": "Sortable.js",
4-
"version": "0.7.0",
4+
"version": "0.7.1",
55
"homepage": "http://rubaxa.github.io/Sortable/",
66
"authors": [
77
"RubaXa <[email protected]>"

component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Sortable",
33
"main": "Sortable.js",
4-
"version": "0.7.0",
4+
"version": "0.7.1",
55
"homepage": "http://rubaxa.github.io/Sortable/",
66
"repo": "RubaXa/Sortable",
77
"authors": [

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sortablejs",
33
"exportName": "Sortable",
4-
"version": "0.7.0",
4+
"version": "0.7.1",
55
"devDependencies": {
66
"grunt": "*",
77
"grunt-version": "*",

0 commit comments

Comments
 (0)