Prepare for 3.7.0 release

lib/ckeditor.rb

@@ -38,6 +38,10 @@ module Backend
   mattr_accessor :relative_path
   @@relative_path = '/assets/ckeditor'
 
+  # Ckeditor assets for precompilation
+  mattr_accessor :assets
+  @@assets = nil
+
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   def self.setup
@@ -49,12 +53,14 @@ def self.root_path
   end
 
   def self.assets
-    Dir[root_path.join('vendor/assets/javascripts/ckeditor/**', '*.{js,css}')].inject([]) do |list, path|
-      unless path.include?("/ckeditor/filebrowser/")
-        list << Pathname.new(path).relative_path_from(root_path.join('vendor/assets/javascripts'))
+    @@assets ||= begin
+      Dir[root_path.join('vendor/assets/javascripts/ckeditor/**', '*.{js,css}')].inject([]) do |list, path|
+        unless path.include?("/ckeditor/filebrowser/")
+          list << Pathname.new(path).relative_path_from(root_path.join('vendor/assets/javascripts'))
+        end
+
+        list
       end
-
-      list
     end
   end
 

lib/ckeditor/engine.rb

@@ -24,7 +24,8 @@ class Engine < ::Rails::Engine
     end
 
     initializer "ckeditor.hooks" do
-      if Object.const_defined?("Formtastic") && Formtastic.const_defined?("Inputs")  # Don't load the hook for Formtastic < 2.0.0 that (it crashes), apparently, didn't define a Formtastic::Inputs.
+      # Don't load the hook for Formtastic < 2.0.0 that (it crashes), apparently, didn't define a Formtastic::Inputs.
+      if Object.const_defined?("Formtastic") && Formtastic.const_defined?("Inputs")
         require "ckeditor/hooks/formtastic"
       end
 

lib/ckeditor/helpers/form_helper.rb

@@ -8,23 +8,18 @@ module FormHelper
 
       def cktext_area(object_name, method, options = {})
         options = { :language => I18n.locale.to_s }.merge(options)
-        input_html = (options.delete(:input_html) || {})
-        hash = input_html.stringify_keys
+        input_html = (options.delete(:input_html) || {}).stringify_keys
+        js_content_for_section = options.delete(:js_content_for)
 
         instance_tag = ActionView::Base::InstanceTag.new(object_name, method, self, options.delete(:object))
-        instance_tag.send(:add_default_name_and_id, hash)
+        instance_tag.send(:add_default_name_and_id, input_html)
 
         output_buffer = ActiveSupport::SafeBuffer.new
         output_buffer << instance_tag.to_text_area_tag(input_html)
 
-        js_content_for_section = options.delete(:js_content_for)
-        js = Utils.js_replace(hash['id'], options)
-        if js_content_for_section
-          content_for(js_content_for_section) { js.html_safe }
-        else
-          output_buffer << javascript_tag(js)
-        end
+        js = Utils.js_replace(input_html['id'], options)
 
+        output_buffer << (js_content_for_section ? content_for(js_content_for_section, js) : javascript_tag(js))
         output_buffer
       end
     end

lib/ckeditor/helpers/view_helper.rb

@@ -7,18 +7,14 @@ def cktext_area_tag(name, content = nil, options = {})
         element_id = sanitize_to_id(name)
         options = { :language => I18n.locale.to_s }.merge(options)
         input_html = { :id => element_id }.merge( options.delete(:input_html) || {} )
+        js_content_for_section = options.delete(:js_content_for)
 
         output_buffer = ActiveSupport::SafeBuffer.new
         output_buffer << text_area_tag(name, content, input_html)
 
-        js_content_for_section = options.delete(:js_content_for)
         js = Utils.js_replace(element_id, options)
-        if js_content_for_section
-          content_for(js_content_for_section) { js.html_safe }
-        else
-          output_buffer << javascript_tag(js)
-        end
 
+        output_buffer << (js_content_for_section ? content_for(js_content_for_section, js) : javascript_tag(js))
         output_buffer
       end
     end

lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "3.7.0.rc3".freeze
-    EDITOR = "3.6.2".freeze
+    GEM = "3.7.0".freeze
+    EDITOR = "3.6.3".freeze
   end
 end