effective_form_inputs 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172bee6eafd010a5aaa58925e69b0a949e24b94c
-  data.tar.gz: ba0fdd250bc6bab098d5a3cdb25494db1d3d85ae
+  metadata.gz: 3622c46e9170761f97e80cc0c391c3ea15157f6f
+  data.tar.gz: 7c88bfbf2433da810bf46ec760b23201d0c6cd88
 SHA512:
-  metadata.gz: 8cef188c31fe49dd35725fbc373ed8030ad7b720a71a5a10338b8f57942763e307783fc39bd725b9210f67217cf1613290b60e05ac19c5165e0879c9a5ac693f
-  data.tar.gz: 04c95b05ff737f172dea75d447eba6719c569e202a6487fc0dec6aa2e0a37da2cddc4e6e54bf1a4ccadb21aa6ec72aaabe62037c702f3287f6c8c85308edb305
+  metadata.gz: bd3c76941e6e316efb9e9a881e25b559aa741fb1a040e9a9116b6bea91c37bc2d9edf5eedb4ceac6308b34f50d9ee6ad6a416ac83f8d6789cde207f144d6d4a6
+  data.tar.gz: d06038c594c698b072010291ba6314d7eb9a78adcdd283a9f18b66bf1af3e329adae8514960d886b17e9be40f605450fa5c62af1138882d180bb089e47cd93c1

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

@@ -42,12 +42,8 @@ setupCkeditor = ($inputs) ->
     ");
 
 initCkeditor = (textarea) ->
-  console.log textarea
-  console.log textarea.data('input-js-options')
-  console.log textarea.data('input-js-options')['toolbar']
-
-  CKEDITOR.replace(textarea.attr('id'),
-    toolbar: ((textarea.data('input-js-options') || {})['toolbar'] || 'full')
+  options =
+    toolbar: 'full'
     effectiveRegionType: 'full'
     customConfig: ''
     enterMode: CKEDITOR.ENTER_P
@@ -81,7 +77,10 @@ initCkeditor = (textarea) ->
       { name: 'insert', items: ['Link', 'Table'] },
       { name: 'lists', items: ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent'] },
     ]
-  )
+
+  options[k] = v for k, v of (textarea.data('input-js-options') || {})
+
+  CKEDITOR.replace(textarea.attr('id'), options)
 
 $ -> initialize()
 $(document).on 'page:change', -> initialize()

data/app/models/inputs/effective_ckeditor_text_area/input.rb

@@ -8,8 +8,10 @@ module Inputs
           effective_assets: defined?(EffectiveAssets).present?,
           effective_ckeditor_js_path: asset_path('effective_ckeditor.js'),
           effective_ckeditor_css_path: asset_path('effective_ckeditor.css'),
-          toolbar: (options[:toolbar] || 'full')
-        }
+          toolbar: options[:toolbar],
+          height: options[:height],
+          width: options[:width]
+        }.compact
       end
 
       def default_input_html

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '0.8.12'.freeze
+  VERSION = '0.8.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails