Skip to content

Commit

Permalink
Fix regression when slots are undefined
Browse files Browse the repository at this point in the history
  • Loading branch information
David-Desmaisons committed Jun 25, 2017
1 parent 003a97b commit 0a5a10c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions dist/vuedraggable.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
this.transitionMode = true;
}
}
var children = [].concat(_toConsumableArray(slots));
var children = slots;
var footer = this.$slots.footer;

if (footer) {
children = [].concat(_toConsumableArray(slots), _toConsumableArray(footer));
children = slots ? [].concat(_toConsumableArray(slots), _toConsumableArray(footer)) : [].concat(_toConsumableArray(footer));
}
return h(this.element, null, children);
},
Expand Down
2 changes: 1 addition & 1 deletion dist/vuedraggable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/dist/vuedraggable.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
this.transitionMode = true;
}
}
var children = [].concat(_toConsumableArray(slots));
var children = slots;
var footer = this.$slots.footer;

if (footer) {
children = [].concat(_toConsumableArray(slots), _toConsumableArray(footer));
children = slots ? [].concat(_toConsumableArray(slots), _toConsumableArray(footer)) : [].concat(_toConsumableArray(footer));
}
return h(this.element, null, children);
},
Expand Down
Loading

0 comments on commit 0a5a10c

Please sign in to comment.