From c8bb468a9fedb5e5f85788ca327b9e08eed3053a Mon Sep 17 00:00:00 2001 From: kewubenduben <4110071+kewubenduben@users.noreply.github.com> Date: Tue, 21 May 2019 17:31:47 +0800 Subject: [PATCH 1/5] Update spree_editor.gemspec --- spree_editor.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_editor.gemspec b/spree_editor.gemspec index e959929..48838b4 100644 --- a/spree_editor.gemspec +++ b/spree_editor.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency 'spree_backend', spree_version s.add_dependency 'spree_extension' s.add_dependency 'ckeditor', '~> 4.2.0' - s.add_dependency 'tinymce-rails', '~> 4.2.5' + s.add_dependency 'tinymce-rails', '~> 4.9' s.add_development_dependency 'i18n-spec', '>= 0.5.0' s.add_development_dependency 'guard-rspec' From 3856ab70792fbbcb5410daa9837b726933cd33f4 Mon Sep 17 00:00:00 2001 From: kewubenduben <4110071+kewubenduben@users.noreply.github.com> Date: Tue, 21 May 2019 18:10:55 +0800 Subject: [PATCH 2/5] Update _tiny_mce.html.erb --- app/views/shared/editor_engines/_tiny_mce.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/shared/editor_engines/_tiny_mce.html.erb b/app/views/shared/editor_engines/_tiny_mce.html.erb index 997d723..237b362 100644 --- a/app/views/shared/editor_engines/_tiny_mce.html.erb +++ b/app/views/shared/editor_engines/_tiny_mce.html.erb @@ -8,7 +8,7 @@ $(document).ready(function () { $('<%= raw ids.each.map{|id| "textarea##{id}" }.join(", ") %>').tinymce( - <%= raw TinyMCE::Rails.configuration.options.to_json %>); + <%= raw TinyMCE::Rails.configuration[:defaults].options.to_json %>); }); @@ -21,4 +21,4 @@ .mce-tinymce button:hover { background-color: inherit !important; } - \ No newline at end of file + From 75e8451e8bac7a778207d9e85a9d87c4478e0a28 Mon Sep 17 00:00:00 2001 From: kewubenduben <4110071+kewubenduben@users.noreply.github.com> Date: Tue, 21 May 2019 19:09:07 +0800 Subject: [PATCH 3/5] typo fix --- app/views/shared/editor_engines/_tiny_mce.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/editor_engines/_tiny_mce.html.erb b/app/views/shared/editor_engines/_tiny_mce.html.erb index 237b362..5e7c7fc 100644 --- a/app/views/shared/editor_engines/_tiny_mce.html.erb +++ b/app/views/shared/editor_engines/_tiny_mce.html.erb @@ -8,7 +8,7 @@ $(document).ready(function () { $('<%= raw ids.each.map{|id| "textarea##{id}" }.join(", ") %>').tinymce( - <%= raw TinyMCE::Rails.configuration[:defaults].options.to_json %>); + <%= raw TinyMCE::Rails.configuration[:default].options.to_json %>); }); From d69d7f8caeb78e792f7b18061f5ad04d032f519b Mon Sep 17 00:00:00 2001 From: kewubenduben <4110071+kewubenduben@users.noreply.github.com> Date: Sun, 27 Oct 2019 04:47:58 +0800 Subject: [PATCH 4/5] Use tinymce-rails 5.0 --- spree_editor.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_editor.gemspec b/spree_editor.gemspec index 48838b4..1c6863f 100644 --- a/spree_editor.gemspec +++ b/spree_editor.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency 'spree_backend', spree_version s.add_dependency 'spree_extension' s.add_dependency 'ckeditor', '~> 4.2.0' - s.add_dependency 'tinymce-rails', '~> 4.9' + s.add_dependency 'tinymce-rails', '~> 5.0' s.add_development_dependency 'i18n-spec', '>= 0.5.0' s.add_development_dependency 'guard-rspec' From 5d450d6a677e645995c23f3350c82fa322c42f3a Mon Sep 17 00:00:00 2001 From: Ker Ruben Ramos Date: Sun, 27 Oct 2019 07:53:00 +0800 Subject: [PATCH 5/5] Update caller --- app/views/shared/editor_engines/_tiny_mce.html.erb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/views/shared/editor_engines/_tiny_mce.html.erb b/app/views/shared/editor_engines/_tiny_mce.html.erb index 5e7c7fc..b74c6a2 100644 --- a/app/views/shared/editor_engines/_tiny_mce.html.erb +++ b/app/views/shared/editor_engines/_tiny_mce.html.erb @@ -2,16 +2,13 @@ +<%= tinymce %> +