diff --git a/.ruby-version b/.ruby-version index 1effb003..24ba9a38 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7 +2.7.0 diff --git a/Gemfile b/Gemfile index 0dd5fb81..8025373f 100644 --- a/Gemfile +++ b/Gemfile @@ -15,4 +15,6 @@ gemspec gem "activeadmin" gem "mimemagic", github: "mimemagicrb/mimemagic", ref: "01f92d86d15d85cfd0f20dabd025dcbd36a8a60f" +gem "sassc", require: ENV["SPROCKETS"] == "true" +gem "sassc-rails", require: ENV["SPROCKETS"] == "true" gem "webpacker", "~> 5.0", require: ENV["SPROCKETS"] != "true" diff --git a/Gemfile.lock b/Gemfile.lock index 0da2a0ea..81f55521 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,8 +13,6 @@ PATH railties redcarpet require_all - sassc - sassc-rails xdan-datetimepicker-rails (~> 2.5.1) GEM diff --git a/activeadmin_addons.gemspec b/activeadmin_addons.gemspec index c64fbfc5..4f12968f 100644 --- a/activeadmin_addons.gemspec +++ b/activeadmin_addons.gemspec @@ -22,8 +22,6 @@ Gem::Specification.new do |s| s.add_dependency "railties" s.add_dependency "redcarpet" s.add_dependency "require_all" - s.add_dependency "sassc" - s.add_dependency "sassc-rails" s.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1" s.add_development_dependency "aasm" diff --git a/app/assets/javascripts/activeadmin_addons/all.js b/app/assets/javascripts/activeadmin_addons/all.js index 0846df99..46dd8368 100644 --- a/app/assets/javascripts/activeadmin_addons/all.js +++ b/app/assets/javascripts/activeadmin_addons/all.js @@ -447,7 +447,8 @@ width: width, multiple: true, tags: true, - data: collection + data: collection, + tokenSeparators: $(el).data("tokenSeparators") || [ "," ] }; if (!!isRelation) { selectOptions.createTag = function() { diff --git a/app/inputs/tags_input.rb b/app/inputs/tags_input.rb index 470e1292..13a28fb0 100644 --- a/app/inputs/tags_input.rb +++ b/app/inputs/tags_input.rb @@ -13,6 +13,7 @@ def load_control_attributes load_data_attr(:model, value: model_name) load_data_attr(:method, value: method) load_data_attr(:width, default: "80%") + load_data_attr(:token_separators) if active_record_select? load_data_attr(:relation, value: true) @@ -25,7 +26,9 @@ def load_control_attributes private def render_array_tags - render_tags_control { build_hidden_control(prefixed_method, method_to_input_name, input_value) } + render_tags_control { + build_hidden_control(prefixed_method, method_to_input_name, input_value.try(:join, ",")) + } end def render_collection_tags diff --git a/app/javascript/activeadmin_addons/inputs/tags.js b/app/javascript/activeadmin_addons/inputs/tags.js index 09bf9d9b..c3c31b59 100644 --- a/app/javascript/activeadmin_addons/inputs/tags.js +++ b/app/javascript/activeadmin_addons/inputs/tags.js @@ -18,6 +18,7 @@ var initializer = function() { multiple: true, tags: true, data: collection, + tokenSeparators: $(el).data('tokenSeparators') || [','] }; if (!!isRelation) { diff --git a/lib/activeadmin_addons/engine.rb b/lib/activeadmin_addons/engine.rb index 779588a0..21ee5cca 100644 --- a/lib/activeadmin_addons/engine.rb +++ b/lib/activeadmin_addons/engine.rb @@ -1,8 +1,10 @@ module ActiveAdminAddons module Rails class Engine < ::Rails::Engine - require 'sassc' - require 'sassc-rails' + if ENV["SPROCKETS"] == "true" + require 'sassc' + require 'sassc-rails' + end require "xdan-datetimepicker-rails" require "require_all" require "active_material" diff --git a/package.json b/package.json index 626e0f04..6d020ed9 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "activeadmin_addons", + "name": "@joker-7777/activeadmin_addons", "version": "1.0.0", "description": "Set of addons to help with the activeadmin ui", "main": "src/all.js", @@ -7,7 +7,7 @@ "src/*" ], "repository": "https://github.com/platanus/activeadmin_addons.git", - "author": "Platanus ", + "author": "Johannes Köhler ", "license": "MIT", "scripts": { "build": "rollup --config rollup.config.js",