tinymce-rails 5.10.2 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f33721f9949bdeec4e91b61655ebf03e5e5c872a44babe32dfe1b4b45e84e9
-  data.tar.gz: 01c316a6b1e95cb836de79e2c61c412c71011e0227a277fd5594ab39ea456e36
+  metadata.gz: 24840c796b9ce02c8b8dffa0d84c8d2a576f5b9dc1846a2a72b7f288d3adb6fa
+  data.tar.gz: ebc900a50eaaffb3c327cf178e8966720003434525a4c3132f105b42f8502bf0
 SHA512:
-  metadata.gz: 36d6c984ab967c0ff585f94cfe7da3b8c53c6236f4e0d78f08a70355da9159473619526d168bf0c8ab483793c940522abcb6ec5b6bce93bb930fe9eaa74b7e1f
-  data.tar.gz: 036ff6f793b51621aa688dca6673ba70cd6078a05095c4ab2ebfdf6fdd53c1efc09f63ccb9ed07bd6264c590412bfc5d9fac062bceccec0593c7af404fc3865d
+  metadata.gz: 9d1c997a8cfb5846581139bd2d48c6da9460b26f5f8e0737b4a942af934ca46cf1797c3083de1ab94f5f0ab6cb78161ca1cdc554e55a27a9ba065b0b2b2f946d
+  data.tar.gz: 17bcbb7e78fdf4fd6e49af9536619a409af1e115b35340cca5c370f553deca6da752079f8579d63c529a75abfed38a2746a36b7f9f6c6da44db695e3950870be

data/README.md

@@ -5,11 +5,10 @@ The `tinymce-rails` gem integrates the [TinyMCE](https://www.tiny.cloud/) editor
 
 This gem is compatible with Rails 4.2 and higher.
 
-This is the branch for TinyMCE 5. For TinyMCE 4, please see the [tinymce-4 branch](https://github.com/spohlenz/tinymce-rails/tree/tinymce-4), 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.svg?branch=master)](https://travis-ci.org/spohlenz/tinymce-rails)
+[![Build Status](https://travis-ci.org/spohlenz/tinymce-rails.svg?branch=main)](https://travis-ci.org/spohlenz/tinymce-rails)
 
-**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
 ------------
@@ -51,7 +50,7 @@ alternate:
     - table
 ```
 
-See the [TinyMCE 5 Documentation](https://www.tiny.cloud/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**
@@ -64,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 %>
@@ -120,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 %>
 
 <script type="text/javascript">
-  tinyMCE.init({
+  tinymce.init({
     selector: 'textarea.editor'
   });
 </script>
@@ -152,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

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() {