tinymce-rails 5.10.4 → 6.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a2508b55e1479d9224ae7925e1b337e5c4635a25cb62b0f18cd0a490f1f1dc8
-  data.tar.gz: 0a134df6e63f19cde42bc81061f75beb8254f981b8afe962b2335460c2936fd4
+  metadata.gz: db5ed00af332610fb1a8d4897f2ef750858a36a68e97f2f858b48ee216ff1bf4
+  data.tar.gz: 6bf27b3ba617ad8864e93c6317a4416107df32ac4b462bcc9063df0e021402f7
 SHA512:
-  metadata.gz: 24e2bb5fda2bbbdfd93aca91f9eb94798509797109af99eb6b2939ca702777defb18520a2bff7a00081ff97c7f8f08b503ab0188bf901ce0411fb2fe8f217028
-  data.tar.gz: a91601a0dcf4313ee3e52e57eb536a9fb303cb1b4a2d26ce66aa7c176e102ffe1c035b0da80350a26baafe2ee8a922d12918c11825a6787f00e9dd87d1eb8ab0
+  metadata.gz: 57e5d0623a3ded5be0d7986a7718d5b02c81569c6b1c81bf0865dccb3a1d1aa21d5e8541c0d112b3dbafc409fef34240859e48261723ab486b20935799583ea3
+  data.tar.gz: 3adaa3b7cc7b3d610d23fecdec1388852a5d6b4790787b1f78083baf0ad432195826ce953df93902212c63eccd4e058b22dc332d2acf055bef989b05c2a5c411

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