effective_bootstrap 0.10.11 → 0.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faec7cf96ce05f8354a1f861f7ddbfc69993d9cc72645d4386e3a75d83d268e6
-  data.tar.gz: 64c72a6d74234cdb15502e6292c69089c637392c464b57dd323ddf36cbe28f80
+  metadata.gz: 7def34ec9dc81a3f0d75be46a758bbef451f8b8eb589c3d45e339219b3ffebd3
+  data.tar.gz: 2502f9cb998f7627048892094f9746a46cd03762bd09028d22cd6c839afb9f75
 SHA512:
-  metadata.gz: fa78150a15a5bbc41fdd79a09569a1d34f5cad972dc56ecfba51e8988588b2c047586029ad58b6829c5cd71ef4673238d41ed83382f94aadd26b59195e54328a
-  data.tar.gz: 0a23c6d1f743b83b31e12a8e9535c4b3484e03a992f8c0659dae349f9c2db3987c8cc02e1ab6a57209ebfa4c67a8e8b6af11565e449840490ede83bb8045c49d
+  metadata.gz: 10224457b7040e414505ee7a6f8c79558aa1e03d21e88fc5f8509c2faa260c6df45a025ea6bd032572ab7d602162910418d8f9a7fb469924cd9995ce8eca34d2
+  data.tar.gz: d4c0ffd205cbfd7849fdb5b64ec8d0235e5c3abc0929f94306188fd855a8f3815e9ffb16ac7c886f54b127731b29a7c2d276becb31ff0a69f7b7e3fbaa0e23ab

data/app/assets/javascripts/effective_bootstrap/logic.js.coffee

@@ -15,6 +15,7 @@
     else
       $element.fadeIn()
       $element.find('input,textarea,select,button').removeAttr('disabled')
+      $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
 
   # Maybe disable it now
   if options.needDisable
@@ -35,6 +36,7 @@
     if matches
       $element.fadeIn()
       $element.find('input,textarea,select,button').removeAttr('disabled')
+      $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
     else
       $element.hide()
       $element.find('input,textarea,select,button').prop('disabled', true)
@@ -54,6 +56,8 @@
     if found
       $element.fadeIn()
       $element.find('input,textarea,select,button').removeAttr('disabled')
+      $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
+
     else
       $element.hide()
       $element.find('input,textarea,select,button').prop('disabled', true)

data/app/assets/javascripts/effective_bootstrap/other.js.coffee

@@ -7,6 +7,8 @@ $(document).on 'cocoon:before-remove', (event, $obj) ->
 
   if confirm && !confirmed
     event.preventDefault()
+  else if $button.data('skip-fadeout')
+    # Nothing to do
   else
     $(event.target).data('remove-timeout', 1000)
     $obj.fadeOut('slow')

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

@@ -1,24 +1,24 @@
 # https://select2.github.io/examples.html
 
-formatWithGlyphicon = (data, container) ->
-  if data.element && data.element.className
-    $("<span><i class='glyphicon #{data.element.className}'></i> #{data.text}</span>")
-  else
-    data.text
-
-formatWithHtml = (data, container) ->
+effectiveFormat = (data, container) ->
   if data.element && data.element.getAttribute('data-html')
     $(data.element.getAttribute('data-html'))
+  else if data.text.startsWith("<") && data.text.endsWith(">")
+    $(data.text)
   else
     data.text
 
-matchWithHtml = (params, data) ->
+effectiveMatch = (params, data) ->
   return data if $.trim(params.term) == ''
   return null unless data.element?
 
   # Single item mode
   term = params.term.toLowerCase()
+
+  # The text value
   text = $(data.element.getAttribute('data-html')).text()
+  text = $(data.text).text() if text.length == 0
+  text = data.text if text.length == 0
 
   if(text.length > 0)
     if text.toLowerCase().indexOf(term) > -1 then return(data) else return(null)
@@ -29,7 +29,11 @@ matchWithHtml = (params, data) ->
   filteredChildren = []
 
   $.each(data.children, (idx, child) ->
+    # Text value
     text = $(child.element.getAttribute('data-html')).text()
+    text = $(data.text).text() if text.length == 0
+    text = data.text if text.length == 0
+
     filteredChildren.push(child) if text.toLowerCase().indexOf(term) > -1
   )
 
@@ -41,14 +45,9 @@ matchWithHtml = (params, data) ->
   return modifiedData
 
 (this.EffectiveBootstrap || {}).effective_select = ($element, options) ->
-  switch options['template']
-    when 'glyphicon'
-      options['templateResult'] = formatWithGlyphicon
-      options['templateSelection'] = formatWithGlyphicon
-    when 'html'
-      options['templateResult'] = formatWithHtml
-      options['templateSelection'] = formatWithHtml
-      options['matcher'] = matchWithHtml
+  options['templateResult'] = effectiveFormat
+  options['templateSelection'] = effectiveFormat
+  options['matcher'] = effectiveMatch
 
   if options['noResults']
     noResults = options['noResults']

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.10.11'.freeze
+  VERSION = '0.10.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.10.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails