From ebe4731ea6a9e119e32dc8de2ee63fc6536230ea Mon Sep 17 00:00:00 2001 From: Zac Zheng Date: Thu, 22 Sep 2011 16:30:47 +0100 Subject: [PATCH 1/4] fixed plugin configuration double quote encoding issue for rails 3.0 --- lib/tiny_mce/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tiny_mce/configuration.rb b/lib/tiny_mce/configuration.rb index 5fb93d4..3a1790b 100644 --- a/lib/tiny_mce/configuration.rb +++ b/lib/tiny_mce/configuration.rb @@ -82,7 +82,7 @@ def to_json when String, Symbol, Fixnum "'#{value.to_s}'" when Array - '"' + value.join(',') + '"' + "'" + value.join(',') + "'" when TrueClass 'true' when FalseClass From 9fa94cae38df8f33e93715390f4d7b18af17f6f8 Mon Sep 17 00:00:00 2001 From: Zac Zheng Date: Fri, 11 Jan 2013 12:51:14 +0800 Subject: [PATCH 2/4] add .html_safe to end of raw_tiny_mce_init for Rails 3.0.17 compatibility --- lib/tiny_mce/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tiny_mce/helpers.rb b/lib/tiny_mce/helpers.rb index 582bcf8..c6f602f 100644 --- a/lib/tiny_mce/helpers.rb +++ b/lib/tiny_mce/helpers.rb @@ -33,7 +33,7 @@ def raw_tiny_mce_init(options = {}, raw_options = nil) end - tinymce_js + tinymce_js.html_safe end # Form the raw JS and wrap in in a