effective_bootstrap 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0b0fa27d610c17c42de7d82659333f92457da0050f652539c32f4a5e83624d
-  data.tar.gz: c6e8f4887ca851c02192c4688a350029faa26d948c66889b1949d40b6ac1d3fa
+  metadata.gz: be5065b3a822eb4860a24310fb77bf65ec46dacafa61abca132c76372d5e58c4
+  data.tar.gz: 2d5d1531f25ad0d8bec41a6fbe1c90d7f1a3117e4309afac88cc5b54de38d092
 SHA512:
-  metadata.gz: b70344c9202d5286941f3143a4b73aaeb3fadb685bba759d8e1f6225eafbdf82deda0c7beb3ba341e71d2f74132621b734d48d3e713c8226cc00030100d55e5a
-  data.tar.gz: d1b12cbccaf8578b59928dba24ad163ef4e15ae9d43a08e7dac2e37146394bd0a863f45e1904fbee9f6ed43c7abb4a92923ca07d69a2ff2b9eac73ab250aac39
+  metadata.gz: e4b1f4a32795ed3b24557647f87571ac87415ffb1d146449f4421199db55141b878f6aaf9a57d7c67d0bcbf73f9912d12eebec0955dee38e9ac99158ca80f660
+  data.tar.gz: d256e2b4cbe06bc4bf0126f09e143ce42ccebfaa24e5d7a14bd44373092bbe3dbac5300cdaf612a0d57a51fc8d7dc4055c58210b9ca52265be38efdab22a9720

data/README.md

@@ -381,6 +381,8 @@ The standard mode is a replacement for the default single select box.
 
 Passing `multiple: true` will allow multiple selections to be made.
 
+Passing `freeform: true` will allow a single selection and new ones to be created.
+
 Passing `multiple: true, tags: true` will allow multiple selections to be made, and new value options to be created.  This will allow you to both select existing tags and create new tags in the same form control.
 
 Passing `grouped: true` will enable optgroup support.  When in this mode, the collection should be a Hash of ActiveRecord Relations or Array of Arrays

data/app/assets/javascripts/effective_select/initialize.js.coffee

@@ -28,6 +28,11 @@ matchWithHtml = (params, data) ->
       options['templateSelection'] = formatWithHtml
       options['matcher'] = matchWithHtml
 
+  if options['noResults']
+    noResults = options['noResults']
+    delete options['noResults']
+    options['language'] = { noResults: (_) -> noResults }
+
   $select = $element.select2(options)
 
   # effective_select custom class functionality
@@ -49,5 +54,3 @@ $(document).on 'change', "select.effective_select.polymorphic", (event) ->
 
   $select.siblings("input[type='hidden'][name$='_type]']").val(value.split('_')[0] || '')
   $select.siblings("input[type='hidden'][name$='_id]']").val(value.split('_')[1] || '')
-
-

data/app/models/effective/form_inputs/select.rb

@@ -29,17 +29,15 @@ module Effective
       end
 
       def input_js_options
-        placeholder = options.delete(:placeholder)
-        placeholder = '' if placeholder == false
-
         opts = {
           theme: 'bootstrap',
-          minimumResultsForSearch: 6,
+          minimumResultsForSearch: (freeform? ? 0 : 6),
           width: 'style',
-          placeholder: (placeholder || 'Please choose'),
+          placeholder: placeholder,
           allowClear: (true if include_blank?),
           tokenSeparators: ([',', ';', '\n', '\t'] if tags?),
           tags: (true if tags?),
+          noResults: no_results,
           template: js_template,
           containerClass: ('hide-disabled' if hide_disabled?),
           dropdownClass: ('hide-disabled' if hide_disabled?),
@@ -51,6 +49,7 @@ module Effective
         classes = [
           'effective_select',
           'form-control',
+          ('freeform' if freeform?),
           ('polymorphic' if polymorphic?),
           ('grouped' if (grouped? || polymorphic?)),
           ('hide-disabled' if hide_disabled?),
@@ -109,11 +108,13 @@ module Effective
       end
 
       def multiple?
+        return false if freeform?
         return @multiple unless @multiple.nil?
         @multiple = options.key?(:multiple) ? options.delete(:multiple) : (tags? || name.to_s.ends_with?('_ids'))
       end
 
       def tags?
+        return true if freeform?
         return @tags unless @tags.nil?
         @tags = (options.delete(:tags) || false)
       end
@@ -133,11 +134,39 @@ module Effective
         @disable_open_on_focus = (options.delete(:disable_open_on_focus) || false)
       end
 
+      def freeform?
+        return @freeform unless @freeform.nil?
+        @freeform = (options.delete(:freeform) || false)
+      end
+
+      def no_results
+        return @no_results unless @no_results.nil?
+
+        @no_results = options.delete(:no_results) 
+
+        if freeform?
+          @no_results ||= 'No results. To create a new one, press ENTER after typing your own free form response.'
+        end
+      end
+
       def js_template
         return @js_template unless @js_template.nil?
         @js_template = options.delete(:template)
       end
 
+      def placeholder
+        return @placeholder unless @placeholder.nil?
+
+        obj = options.delete(:placeholder)
+
+        @placeholder = case obj
+        when nil then 
+          (freeform? ? 'Choose or enter' : 'Please choose')
+        when false then ''
+        else obj
+        end
+      end
+
       def ajax_url
         @ajax_url ||= (options.delete(:ajax_url) || options.delete(:ajax) || options.delete(:url))
       end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails