tinymce-rails 4.6.4 → 4.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ce018de101ce52c7c97b1ec464c50a96f25805a
-  data.tar.gz: 31c037f319b428cecdd48ec343fdd5f28f5259bc
+SHA256:
+  metadata.gz: 2d4a9e6b463099f136b4a76925e428f4adbdc905d04d316a97b1ea3508a10ddf
+  data.tar.gz: 103162d595c1bd4948ef0f41c101a5388a77d521737855a076c4c077d7b92038
 SHA512:
-  metadata.gz: 83fc0e180593e62c25bcf6fc3b9a3d8d5aa19b747a67173045ee8db0237fca26f43ab826cc03187caf1feee8bfaf43067676bc45b450f398637331b2b575139b
-  data.tar.gz: ea0d70f73da56bca7beb9a6b0e4beb4862247c137a329c35d0ac9127ba47538ad4a09f7bf218633bff60c0a86a35f4819fd8fe1cff862d9dfc37efc504e09452
+  metadata.gz: 80ed2f75eb71bab2b14c5d380d6c8c9400079f253baa34471102fd71afa3019a3931f1843375a00f47d0398e43eb672568a2c6960bb6cf06ce62a2f00bbc28c6
+  data.tar.gz: cbc4371630d008d8b2d308ad0cd9687b43487bfbdf9e6f1d15f0bff8295ea5c41a03fa213a3d1e488103ae234600cce3660993c411718d4bedf70ac6fe62ac14

data/README.md

@@ -5,7 +5,7 @@ The `tinymce-rails` gem integrates the [TinyMCE](http://www.tinymce.com/) editor
 
 This gem is compatible with Rails 3.1.1 and higher (including Rails 4).
 
-This is the branch for TinyMCE 4. 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 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).
 
 [![Build Status](https://travis-ci.org/spohlenz/tinymce-rails.png?branch=master)](https://travis-ci.org/spohlenz/tinymce-rails)
 
@@ -45,6 +45,7 @@ default:
     - link
 
 alternate:
+  <<: *default
   selector: textarea.table-editor
   toolbar: styleselect | bold italic | undo redo | table
   plugins:

data/app/assets/javascripts/tinymce/preinit.js.erb

@@ -2,9 +2,3 @@ window.tinymce = window.tinymce || {
   base:   '<%= TinyMCE::Rails::Engine.base %>',
   suffix: ''
 };
-
-if (typeof Turbolinks != 'undefined' && Turbolinks.supported) {
-  document.addEventListener('turbolinks:before-render', function() {
-    tinymce.remove();
-  });
-}

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

@@ -0,0 +1,51 @@
+window.TinyMCERails = {
+  configuration: {
+    default: {}
+  },
+
+  initialize: function(config, options) {
+    if (typeof tinyMCE != 'undefined') {
+      // Merge the custom options with the given configuration
+      var configuration = TinyMCERails.configuration[config || 'default'];
+      configuration = TinyMCERails._merge(configuration, options);
+
+      tinyMCE.init(configuration);
+    } else {
+      // Wait until TinyMCE is loaded
+      setTimeout(function() {
+        TinyMCERails.initialize(config, options);
+      }, 50);
+    }
+  },
+
+  setupTurbolinks: function() {
+    // Remove all TinyMCE instances before rendering
+    document.addEventListener('turbolinks:before-render', function() {
+      tinymce.remove();
+    });
+  },
+
+  _merge: function() {
+    var result = {};
+
+    for (var i = 0; i < arguments.length; ++i) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          if (Object.prototype.toString.call(source[key]) === '[object Object]') {
+            result[key] = TinyMCERails._merge(result[key], source[key]);
+          } else {
+            result[key] = source[key];
+          }
+        }
+      }
+    }
+
+    return result;
+  }
+};
+
+if (typeof Turbolinks != 'undefined' && Turbolinks.supported) {
+  TinyMCERails.setupTurbolinks();
+}

data/app/assets/javascripts/tinymce-jquery.js

@@ -1,3 +1,2 @@
-//= require tinymce/preinit.js
-//= require tinymce/tinymce.js
+//= require tinymce.js
 //= require tinymce/jquery.tinymce.js

data/app/assets/javascripts/tinymce.js

@@ -1,2 +1,3 @@
+//= require tinymce/rails.js
 //= require tinymce/preinit.js
 //= require tinymce/tinymce.js