browsercms 3.5.3 → 3.5.4

data/app/assets/javascripts/bcms/ckeditor_load.js.erb

@@ -1,48 +1,51 @@
-jQuery(function($){
-  $('textarea.editor').each(function(e){
-    if(editorEnabled()) {
-      loadEditor(this.id)
-    }
-  });
+// Replace any <textarea class="editor"> with a ckeditor widget.
+//
+// Note: Uses noConflict version of jquery to avoid possible issues with loading ckeditor.
+jQuery(function ($) {
+    $('textarea.editor').each(function (e) {
+        if (editorEnabled()) {
+            loadEditor(this.id);
+        }
+    });
 });
 
 function editorEnabled() {
-  return $.cookie('editorEnabled') ? $.cookie('editorEnabled') == "true" : true
+    return $.cookie('editorEnabled') ? $.cookie('editorEnabled') == "true" : true;
 }
 
 function disableEditor(id) {
-  if(typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
-    $('#'+id).val(CKEDITOR.instances[id].getData()).show()
-    CKEDITOR.instances[id].destroy();
-    $.cookie('editorEnabled', false, { expires: 90, path: '/' })
-  }
+    if (typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
+        $('#' + id).val(CKEDITOR.instances[id].getData()).show();
+        CKEDITOR.instances[id].destroy();
+        $.cookie('editorEnabled', false, { expires:90, path:'/' });
+    }
 }
 
 function enableEditor(id) {
-  if(typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
-    CKEDITOR.instances[id].setData($('#'+id).val())
-    $('#'+id).hide()
-    $.cookie('editorEnabled', true, { expires: 90, path: '/' })
-  }
+    if (typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
+        CKEDITOR.instances[id].setData($('#' + id).val());
+        $('#' + id).hide();
+        $.cookie('editorEnabled', true, { expires:90, path:'/' });
+    }
 }
 
 function toggleEditor(id, status) {
-  loadEditor(id)
-  if(status == 'Simple Text' || status.value == 'disabled'){
-    disableEditor(id)
-  } else {
-    enableEditor(id)
-  }
+    loadEditor(id);
+    if (status == 'Simple Text' || status.value == 'disabled') {
+        disableEditor(id);
+    } else {
+        enableEditor(id);
+    }
 }
 
 function loadEditor(id) {
-  if(typeof(CKEDITOR) != "undefined") {
-    if (CKEDITOR.instances[id] == null) {
-      CKEDITOR.replace(id, { customConfig : '<%= asset_path(Rails.application.config.cms.ckeditor.configuration_file) %>' });
+    if (typeof(CKEDITOR) != "undefined") {
+        if (CKEDITOR.instances[id] == null) {
+            CKEDITOR.replace(id, { customConfig:'<%= asset_path(Rails.application.config.cms.ckeditor.configuration_file) %>' });
+        }
+        $.cookie('editorEnabled', true, { expires:90, path:'/' });
+        return true;
+    } else {
+        return false;
     }
-    $.cookie('editorEnabled', true, { expires: 90, path: '/' })
-    return true
-  } else {
-    return false
-  }
 }

data/app/helpers/cms/page_helper.rb

@@ -4,8 +4,13 @@ module Cms
     # Return the JS file to load the configured default WYSIWYG editor
     #
     # Ideally, this could be improved if sprockets allows for dynamically determining which js library to use.
+    # @return [Array] Names of the JS files need to load the editor.
     def cms_content_editor
-      "bcms/#{Cms.content_editor}"
+      if Cms.content_editor.is_a?(Array)
+        Cms.content_editor
+      else
+        "bcms/#{Cms.content_editor}" # Handles existing FCKEditor behavior
+      end
     end
 
     # Outputs the title for this page. Used by both internal CMS pages, as well as page templates. If not explicitily set,

data/app/views/layouts/cms/_head.html.erb

@@ -4,7 +4,8 @@
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
   <title><%= @page_title %></title>
   <%= stylesheet_link_tag 'cms/application', 'cms/date_picker', 'cms/sitemap', 'cms/taglist' %>
-  <%= javascript_include_tag "cms/application", cms_content_editor %>
+  <%= javascript_include_tag "cms/application" %>
+  <%= javascript_include_tag *cms_content_editor %>
   <%= csrf_meta_tags %>
   <script type="text/javascript">
     jQuery(function($){

data/db/migrate/20120813180110_browsercms354.rb

@@ -0,0 +1,9 @@
+class Browsercms354 < ActiveRecord::Migration
+  def up
+    # Attachments should not be overly specific, since it prevents joins from working.
+    ["Cms::ImageBlock", "Cms::FileBlock"].each do |old_type|
+      Cms::Attachment.unscoped.update_all({:attachable_type => "Cms::AbstractFileBlock"}, {:attachable_type => old_type})
+    end
+  end
+end
+

data/doc/release_notes.md

@@ -1,3 +1,8 @@
+v3.5.4
+======
+
+* [IE and Ckeditor] Fix issue where ckeditor would not load correctly in production for users using Internet Explorer 7-9.
+
 v3.5.3
 ======
 

data/lib/cms/configuration.rb

@@ -11,7 +11,8 @@ module Cms
     #
     # bcms modules can changes this by overriding it in their configuration.
     def content_editor
-      @wysiwig_editor ||= "ckeditor"
+      # CKEditor is the default.
+      @wysiwig_editor ||= ['bcms/ckeditor_load', 'ckeditor-jquery']
     end
 
     def content_editor=(editor)

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.5.3"
+  VERSION = "3.5.4"
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.2.2
+        version: 3.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.2.2
+        version: 3.6.4
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -643,6 +643,7 @@ files:
 - db/migrate/20111130221145_browsercms340.rb
 - db/migrate/20120329144406_browsercms350.rb
 - db/migrate/20120717182827_browsercms353.rb
+- db/migrate/20120813180110_browsercms354.rb
 - db/schema.rb
 - db/seeds.rb
 - doc/design/blue_button.psd
@@ -775,7 +776,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3887349942334149807
+      hash: 250022716012071557
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24