effective_form_inputs 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e29d7adcba10153ba227c0a57d8f932751c0421
-  data.tar.gz: e9ce8f96ea31f6c403dc5c7a72e44b3e21dd045a
+  metadata.gz: b27b137d43729afe8f73c2ad90f1472a5d7fe72a
+  data.tar.gz: beb2a984a5262a8c00e0596c8f9c22d3a04d9657
 SHA512:
-  metadata.gz: 072a6b75bed552aaa270adfa8a3b2c4629e9459a29622d7eaaf32f91ee29a8d0fb9a19920ef17f352c583fa51d87176b04a306d5a97fddba2f61a51c1d4c79f6
-  data.tar.gz: 31e2f0a827ba0aafd096e10983ea9ea1067d4a8e1b386c983c316c0d750aeb13fcd678a999a01164e0074f31b427e07a22cc6b3855c044309a3e14a12147fdb1
+  metadata.gz: e41f7b8acc42cef070a9dda74f757c27aca0eb8848bd927af6f39a6c41d1df65eed188313e2e62c891b352ecd162e89f3cf77178bb0e54481beddef6ff51cc4f
+  data.tar.gz: 7701c46726dc9b8008ab4c84778b0a573133ff16c37b855a548c27b916a0843ccb59eb3cfa5c17fab96f75917848cf7583048494d858525fcf8b90875e23ec7f

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

@@ -11,29 +11,33 @@ initialize = ->
 setupCkeditor = ($inputs) ->
   return unless $inputs.length > 0
 
+  input_js_options = $inputs.first().data('input-js-options') || {}
+
   ckeditor_present = ((try CKEDITOR.version) || '').length > 0
-  use_effective_assets = ($inputs.first().data('input-js-options') || {})['effective_assets'] == true
+  use_effective_assets = input_js_options['effective_assets'] == true
   $head = $('head')
 
   unless ckeditor_present
-    $head.append("<script src='/assets/effective_ckeditor.js' />")
-    $head.append("<link href='/assets/effective_ckeditor.css' type='text/css', media='screen' rel='stylesheet' />")
+    $head.append("<link href='#{input_js_options['effective_ckeditor_css_path']}' type='text/css', media='screen' rel='stylesheet' />")
+    jQuery.ajax({url: input_js_options['effective_ckeditor_js_path'], dataType: 'script', cache: true, async: false})
 
   if use_effective_assets
     $head.append("
       <script>
-      CKEDITOR.config['effective_regions'] = {
-        'snippets': {
-          'effective_asset': {
-            'dialog_url':'/assets/effective/snippets/effective_asset.js',
-            'label':'Effective asset',
-            'description':'Insert Effective asset',
-            'inline':true,
-            'editables':false,
-            'tag':'span'
-          }
-        }
-      };
+        try {
+          CKEDITOR.config['effective_regions'] = {
+            'snippets': {
+              'effective_asset': {
+                'dialog_url':'/assets/effective/snippets/effective_asset.js',
+                'label':'Effective asset',
+                'description':'Insert Effective asset',
+                'inline':true,
+                'editables':false,
+                'tag':'span'
+              }
+            }
+          };
+        } catch(e) {};
       </script>
     ");
 

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

@@ -1,10 +1,14 @@
 module Inputs
   module EffectiveCkeditorTextArea
     class Input < Effective::FormInput
-      delegate :content_tag, :text_area_tag, :to => :@template
+      delegate :content_tag, :text_area_tag, :asset_path, :to => :@template
 
       def default_input_js
-        {effective_assets: defined?(EffectiveAssets).present? }
+        {
+          effective_assets: defined?(EffectiveAssets).present?,
+          effective_ckeditor_js_path: asset_path('effective_ckeditor.js'),
+          effective_ckeditor_css_path: asset_path('effective_ckeditor.css')
+        }
       end
 
       def default_input_html

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '0.8.7'.freeze
+  VERSION = '0.8.8'.freeze
 end

metadata

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