effective_bootstrap 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c73961161d3573b8a086dceedd1b2b97b5c51d5
-  data.tar.gz: 3e73d0c2f628c120064355648474901ccf88d401
+  metadata.gz: 0dcabe6562a28a9ad9845025ee4ba974ca38c846
+  data.tar.gz: 8b022529edf57d27fd3507dab9029c0242297acc
 SHA512:
-  metadata.gz: f50b617e235e67f29da29399ab37e460af5daa2310fbbc9dcbc2b58b6fb8e10fb1be4acaba8f97d226a50ce30c568e1f0ce6af5ab8f5beeed029139e04c7f5ea
-  data.tar.gz: 475fc4f1332c039099623dbdfb011d1105b361b651dca036f59ae9f0a879a88161c47ea2c80a40ac2959f60a914886b0b810879fc33465c8b4b8e6939f943574
+  metadata.gz: 3626fa1ca74154ace16f44e117d0ebef60ec2d9e68dad9d87bbb1f5b10b5fefca5855683cfd9ec2fa981c1028fb4ec2873e1552a3d73936bb6fbf8bc46c612f5
+  data.tar.gz: 7d17e33751e29a7cbc81e94a7afcb74dd4bef5634a333d1e8a360d724490b80b28728f8f79dde48712e26b4f8066c00888cde0c61c5a4d32698cd8d0c1327c39

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

@@ -3,23 +3,32 @@
 (this.EffectiveBootstrap || {}).effective_editor = ($element, options) ->
   editor = '#' + $element.attr('id') + '_editor'
 
-  delta = options['delta']
-  delete options['delta']
+  content_mode = options['content_mode']
+  delete options['content_mode']
 
-  quill = new Quill(editor, options)
+  quill = new Quill($element.siblings(editor).get(0), options)
   content = $element.val() || ''
 
   if content.length > 0
-    if content.startsWith('{') then quill.setContents(JSON.parse(content)) else quill.pasteHTML(content)
-
-  if delta
-    quill.on 'text-change', (delta, old, source) ->
-      $element.val(JSON.stringify(quill.getContents()))
-  else
-    quill.on 'text-change', (delta, old, source) ->
+    if content.startsWith('{')
+      quill.setContents(JSON.parse(content))
+    else if content_mode == 'code'
+      quill.setText(content)
+    else if content.startsWith('<')
+      quill.pasteHTML(content)
+    else
+      quill.setText(content)
+
+  if content_mode == 'code'
+    quill.formatText(0, quill.getLength(), 'code-block', true)
+    quill.on 'text-change', -> $element.val(quill.getText())
+  else if content_mode == 'html'
+    quill.on 'text-change', ->
       html = $(editor).children('.ql-editor').html()
       html = '' if html == '<p><br></p>' || html == '<p></p>'
       $element.val(html)
+  else
+    quill.on 'text-change', -> $element.val(JSON.stringify(quill.getContents()))
 
   $element.on 'quill:focus', (event) -> quill.focus()
 
@@ -27,7 +36,18 @@
 (this.EffectiveBootstrap || {}).effective_editor_tag = ($element, options) ->
   quill = new Quill('#' + $element.attr('id'), options)
 
-  content = ($element.attr('data-delta') || '')
+  content = ($element.attr('data-content') || '')
+  content_mode = $element.data('input-js-options')['content_mode']
 
   if content.length > 0
-    if content.startsWith('{') then quill.setContents($element.data('delta')) else quill.pasteHTML(content)
+    if content.startsWith('{')
+      quill.setContents(JSON.parse(content))
+    else if content_mode == 'code'
+      quill.setText(content)
+    else if content.startsWith('<')
+      quill.pasteHTML(content)
+    else
+      quill.setText(content)
+
+  if content_mode == 'code'
+    quill.formatText(0, quill.getLength(), 'code-block', true)

data/app/assets/stylesheets/effective_editor/overrides.scss

@@ -1,4 +1,5 @@
 .effective_editor { height: 0; width: 0; padding: 0; margin: 0; visibility: hidden; }
+textarea.form-control.effective_editor { height: 0; }
 
 // Bootstrap 4 Feedback client side
 .was-validated .form-control:invalid ~ .ql-container, { border-color: #dc3545; }

data/app/helpers/effective_editor_helper.rb

@@ -1,9 +1,29 @@
 module EffectiveEditorHelper
 
-  def effective_editor_tag(delta)
-    input_js = { method_name: 'effective_editor_tag', theme: 'snow', readOnly: true, modules: { toolbar: false } }
+  def effective_editor_tag(content, options = {})
+    content = content.presence || '{}'
 
-    content_tag(:div, '', id: "ql-#{delta.object_id}", class: 'effective_editor_content ql-effective', data: { 'input-js-options': input_js, 'delta': delta.presence || '{}'})
+    content_mode = (
+      if options.delete(:delta)
+        :delta
+      elsif options.delete(:html)
+        :html
+      elsif options.delete(:code)
+        :code
+      else
+        :delta
+      end
+    )
+
+    input_js = {
+      method_name: 'effective_editor_tag',
+      theme: 'snow',
+      readOnly: true,
+      content_mode: content_mode,
+      modules: { toolbar: false, syntax: (content_mode == :code) }
+    }
+
+    content_tag(:div, '', id: "ql-#{content.object_id}", class: 'effective_editor_content ql-effective', data: { 'input-js-options': input_js, 'content': content })
   end
 
 end

data/app/helpers/effective_form_builder_helper.rb

@@ -5,7 +5,7 @@ module EffectiveFormBuilderHelper
 
     # Compute the default ID
     subject = Array(options[:scope] || options[:model]).last
-    class_name = subject.class.name.parameterize.underscore
+    class_name = subject.class.name.underscore
 
     html_id = if subject.kind_of?(Symbol)
       subject.to_s

data/app/models/effective/form_builder.rb

@@ -18,6 +18,7 @@ module Effective
     end
 
     alias_method :super_text_field, :text_field
+    alias_method :super_text_area, :text_area
 
     def check_box(name, options = {})
       Effective::FormInputs::CheckBox.new(name, options, builder: self).to_html { super(name, options) }

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

@@ -5,7 +5,7 @@ module Effective
       def build_input(&block)
         content = value.presence || (capture(&block) if block_given?)
 
-        @builder.super_text_field(name, options[:input]) +
+        @builder.super_text_area(name, (options[:input] || {}).merge(autocomplete: 'off')) +
         content_tag(:div, '', class: 'ql-effective', id: unique_id + '_editor')
       end
 
@@ -14,11 +14,18 @@ module Effective
       end
 
       def input_js_options
-        { modules: { toolbar: toolbar }, theme: 'snow', placeholder: "Add #{name.to_s.pluralize}...", delta: delta? }
+        {
+          modules: { toolbar: toolbar, syntax: (content_mode == :code) },
+          theme: 'snow',
+          placeholder: "Add #{name.to_s.pluralize}...",
+          content_mode: content_mode
+        }
       end
 
       # Commented out 'Full' toolbar options because currently we don't want headers / source / code options
       def toolbar
+        return false if content_mode == :code
+
         [
           # [{'header': [1, 2, 3, 4, false] }],
           ['bold', 'italic', 'underline'],
@@ -28,14 +35,20 @@ module Effective
         ]
       end
 
-      def delta? # default false
-        return @delta unless @delta.nil?
-
-        if options.key?(:html)
-          @delta = (options.delete(:html) == false)
-        else
-          @delta = (options.delete(:delta) || false)
-        end
+      def content_mode # default false
+        return @content_mode unless @content_mode.nil?
+
+        @content_mode = (
+          if options.delete(:delta)
+            :delta
+          elsif options.delete(:html)
+            :html
+          elsif options.delete(:code)
+            :code
+          else
+            :delta
+          end
+        )
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-16 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails