Skip to content

Commit 02b55c4

Browse files
committed
Merge branch 'tokenSeparators_for_select2_tags'
2 parents 71a1f80 + b15f1fe commit 02b55c4

File tree

2 files changed

+3
-2
lines changed
  • app
    • assets/javascripts/activeadmin_addons
    • javascript/activeadmin_addons/inputs

2 files changed

+3
-2
lines changed

app/assets/javascripts/activeadmin_addons/all.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,8 @@
447447
width: width,
448448
multiple: true,
449449
tags: true,
450-
data: collection
450+
data: collection,
451+
tokenSeparators: $(el).data("tokenSeparators") || [ "," ]
451452
};
452453
if (!!isRelation) {
453454
selectOptions.createTag = function() {

app/javascript/activeadmin_addons/inputs/tags.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var initializer = function() {
1818
multiple: true,
1919
tags: true,
2020
data: collection,
21-
tokenSeparators: $(el).data('tokenSeparators'),
21+
tokenSeparators: $(el).data('tokenSeparators') || [',']
2222
};
2323

2424
if (!!isRelation) {

0 commit comments

Comments
 (0)