tinymce-rails 4.9.11 → 6.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d4a9e6b463099f136b4a76925e428f4adbdc905d04d316a97b1ea3508a10ddf
-  data.tar.gz: 103162d595c1bd4948ef0f41c101a5388a77d521737855a076c4c077d7b92038
+  metadata.gz: 91c53e7e5805eeb9450265223c70b549fded5516f219cb7938c91459ae090af0
+  data.tar.gz: 91c469717354b39d1dd53ef9c5e7c729bd8e4f5bee23cae140925cfe6686e76b
 SHA512:
-  metadata.gz: 80ed2f75eb71bab2b14c5d380d6c8c9400079f253baa34471102fd71afa3019a3931f1843375a00f47d0398e43eb672568a2c6960bb6cf06ce62a2f00bbc28c6
-  data.tar.gz: cbc4371630d008d8b2d308ad0cd9687b43487bfbdf9e6f1d15f0bff8295ea5c41a03fa213a3d1e488103ae234600cce3660993c411718d4bedf70ac6fe62ac14
+  metadata.gz: 9c0426ece5a0161c973af7b6c30b6415ad1c84899dcba485fc7aeea8b09828e4a11e93e88fb591f0daafdd21f7ebc5327aad4cff53167904a4abefdf2f91742f
+  data.tar.gz: 304095a9a91e234ff70d75deb429b39fca5974b4c61e11da954c8a4087cc861caab653fe70fcc8446fb18fc7ab9537e427a39b70df5300368bf93803a451e34b

data/README.md

@@ -1,15 +1,14 @@
 Rails Integration for TinyMCE
 =============================
 
-The `tinymce-rails` gem integrates the [TinyMCE](http://www.tinymce.com/) editor with the Rails asset pipeline.
+The `tinymce-rails` gem integrates the [TinyMCE](https://www.tiny.cloud/) editor with the Rails asset pipeline.
 
-This gem is compatible with Rails 3.1.1 and higher (including Rails 4).
+This gem is compatible with Rails 5.0 and higher.
 
-This is the branch for TinyMCE 4. For TinyMCE 5, please see the [master branch](https://github.com/spohlenz/tinymce-rails), and for TinyMCE 3.5.x, please see the [tinymce-3 branch](https://github.com/spohlenz/tinymce-rails/tree/tinymce-3).
+This is the branch for TinyMCE 6. Please see alternate branches for [TinyMCE 5](https://github.com/spohlenz/tinymce-rails/tree/tinymce-5), [TinyMCE 4](https://github.com/spohlenz/tinymce-rails/tree/tinymce-4) & [TinyMCE 3.5.x](https://github.com/spohlenz/tinymce-rails/tree/tinymce-3).
 
-[![Build Status](https://travis-ci.org/spohlenz/tinymce-rails.png?branch=master)](https://travis-ci.org/spohlenz/tinymce-rails)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/spohlenz/tinymce-rails/rspec.yml)](https://github.com/spohlenz/tinymce-rails/actions)
 
-**New in 3.5.11, 4.1.10 and 4.2.1:** Alternative asset installation methods (copy vs compile/symlink). See the [Asset Compilation](#asset-compilation) section below for details.
 
 Instructions
 ------------
@@ -39,20 +38,19 @@ The Rails server no longer needs to be restarted when this file is updated in de
 To define multiple configuration sets, follow this syntax (a default configuration must be specified):
 
 ```yml
-default:
+default: &default
   plugins:
     - image
     - link
 
 alternate:
   <<: *default
-  selector: textarea.table-editor
   toolbar: styleselect | bold italic | undo redo | table
   plugins:
     - table
 ```
 
-See the [TinyMCE 4 Documentation](https://www.tinymce.com/docs/configure/) for a full list of configuration options.
+See the [TinyMCE 6 Documentation](https://www.tiny.cloud/docs/tinymce/6/) for a full list of configuration options.
 
 
 **3. Include the TinyMCE assets**
@@ -65,13 +63,7 @@ Use *one* of the following options to include TinyMCE assets.
 //= require tinymce
 ```
 
-or (2) with jQuery integration:
-
-```js
-//= require tinymce-jquery
-```
-
-(3) The TinyMCE assets can be included on a per-page basis using the `tinymce_assets` helper:
+or (2) add the script tag to your layout using the `tinymce_assets` helper:
 
 ```erb
 <%= tinymce_assets %>
@@ -84,13 +76,13 @@ or (2) with jQuery integration:
 For each textarea that you want to use with TinyMCE, add the "tinymce" class and ensure it has a unique ID:
 
 ```erb
-<%= text_area_tag :content, "", :class => "tinymce", :rows => 40, :cols => 120 %>
+<%= text_area_tag :content, "", class: "tinymce", rows: 40, cols: 120 %>
 ```
 
 or if you are using Rails' form builders:
 
 ```erb
-<%= f.text_area :content, :class => "tinymce", :rows => 40, :cols => 120 %>
+<%= f.text_area :content, class: "tinymce", rows: 40, cols: 120 %>
 ```
 
 Then invoke the `tinymce` helper to initialize TinyMCE:
@@ -102,7 +94,7 @@ Then invoke the `tinymce` helper to initialize TinyMCE:
 Custom options can be passed to `tinymce` to override the global options specified in `config/tinymce.yml`:
 
 ```erb
-<%= tinymce :theme => "simple", :language => "de", :plugins => ["wordcount", "paste"] %>
+<%= tinymce theme: "simple", language: "de", plugins: ["wordcount", "paste"] %>
 ```
 
 Alternate configurations defined in 'config/tinymce.yml' can be used with:
@@ -121,13 +113,13 @@ See the [tinymce-rails-langs](https://github.com/spohlenz/tinymce-rails-langs) g
 Manual Initialization
 ---------------------
 
-Using the `tinymce` helper and global configuration file is entirely optional. The `tinyMCE.init` function can be invoked manually if desired.
+Using the `tinymce` helper and global configuration file is entirely optional. The `tinymce.init` JS function can be invoked manually if desired.
 
 ```erb
-<%= text_area_tag :editor, "", :rows => 40, :cols => 120 %>
+<%= text_area_tag :editor, "", rows: 40, cols: 120 %>
 
 <script type="text/javascript">
-  tinyMCE.init({
+  tinymce.init({
     selector: 'textarea.editor'
   });
 </script>
@@ -153,11 +145,7 @@ If you experience issues with the `compile` method, you may wish to use the `cop
 config.tinymce.install = :copy
 ```
 
-If you are including TinyMCE via `application.js` or using the `tinymce_assets` helper, you do not need to manually alter the precompile paths. However if you wish to include `tinymce-jquery.js` independently (i.e. using `javascript_include_tag`), you will need to add it to the precompile list in `config/environments/production.rb`:
-
-```ruby
-config.assets.precompile << "tinymce-jquery.js"
-```
+If you are including TinyMCE via `application.js` or using the `tinymce_assets` helper, you do not need to manually add the scripts to the Sprockets precompile paths.
 
 
 Custom Plugins & Skins

data/Rakefile

@@ -29,10 +29,9 @@ task :extract do
     `mv tmp/tinymce/js/tinymce/* vendor/assets/javascripts/tinymce/`
   end
 
-  step "Extracting jQuery & unminified source files" do
+  step "Extracting unminified source" do
    `rm -rf tmp/tinymce`
    `unzip -u tmp/tinymce.dev.zip -d tmp`
-   `mv tmp/tinymce/js/tinymce/jquery.tinymce.min.js vendor/assets/javascripts/tinymce/jquery.tinymce.js`
    `mkdir -p app/assets/source/tinymce`
    `mv tmp/tinymce/js/tinymce/tinymce.js app/assets/source/tinymce/tinymce.js`
   end
@@ -43,10 +42,15 @@ task :rename do
     Dir["vendor/assets/javascripts/tinymce/**/*.min.js"].each do |file|
       FileUtils.mv(file, file.sub(/\.min\.js$/, '.js'))
     end
+
+    Dir["vendor/assets/javascripts/tinymce/**/*.min.css"].each do |file|
+      FileUtils.cp(file, file.sub(/\.min\.css$/, '.css'))
+    end
   end
 end
 
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
+
+require "bundler/gem_tasks"

data/app/assets/javascripts/tinymce/rails.js

@@ -9,7 +9,7 @@ window.TinyMCERails = {
       var configuration = TinyMCERails.configuration[config || 'default'];
       configuration = TinyMCERails._merge(configuration, options);
 
-      tinyMCE.init(configuration);
+      tinymce.init(configuration);
     } else {
       // Wait until TinyMCE is loaded
       setTimeout(function() {