tinymce-rails 5.10.3 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4da720fd17be73337786202fa692da5d169946b9b8d8df175d391d045bdd2af
-  data.tar.gz: 312a2bb6df45469226acfd650c458ada550517a86abcea372126cea26c455735
+  metadata.gz: d0f433559bbeeea283d7a7d5079fe2ef11f82fd98648b53bb7704152fd30a50d
+  data.tar.gz: b2975589c4647c49015fe86346649027d00abcf8aa4d321508c8082200d3e367
 SHA512:
-  metadata.gz: 48847e6c5aa915bb07d64f61eec0e983623b85b4af71da5d3fb2b98b470b64ee4b5060d817b2a7474415c124bad92c6f8bf9ed0921769065b50661530863aaca
-  data.tar.gz: 0c6998327d16d070e3f1402f1d46b7e6549a2192381ab28bf062f80bae9d0d8d70713aa2dc5420f04a62c5c687f5e6fd8b730af2f48255accca2e3591800de0d
+  metadata.gz: 516547fa11396920c89b615a6cb8040eed1d962f55f111d4c0dae7010bf3448e1d73fde8f93a6cbfad02bd3806c9e2142384e570dbb1389ef1a61e03ed784147
+  data.tar.gz: 54c53b2a4df7aa1a926f2d959253d7ac2046e9b54dfbe8ebe7d1b90b7a9c4462dd6e8ac360c9a21a620dd747e9ad89c573c522c24fc4085326e45943fb2f3a5b

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