tinymce-rails 4.9.10 → 4.9.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa577ba4bb17221c1c259c4a18147670dcb81722b0202b28c08913a4d872751
-  data.tar.gz: 86ec35ae2896adbad31380729974a58e08d953bedb61223dccb2ebf16d81e7d8
+  metadata.gz: 9119c17e2bcb3d33ab9b959c0c6c41c8d529106e51ab483f338d1e64423481d4
+  data.tar.gz: 7e358486b6a0f1db1794349cfeb7413538208df73d14bc3b6d221d2069222c91
 SHA512:
-  metadata.gz: 25c329bdd1abb59169c61009a187ccb20345f3ec97cf57f0babbf19bde9a1eb9bf4af731be4916c0615e0ff0dcacefec12223198290e9fb54933f76bb03b8dcf
-  data.tar.gz: 8ac5274d54ef0df889162f70f8fa62164dd631d5c92744a9ca47a8abb56aa63022acabb785e58747be3284b3296867293d75ad9ce505f32b7c8a66a1aab6432f
+  metadata.gz: 5222c58b96aabcf11ea4e41328be95d4f6461aaab3406dc148b5cff078b5d4f2b12c96ca01c5f3c5c83d8c6a9730667afd57640e6c54b4a3e7ef27d57af28bfa
+  data.tar.gz: ec2c6ed08479406cbc7829e702557b9ea9a754f5ab091e9119d216150b463fcfcc061dd83f6d2e8b719aa203dd9b68cd24c4117c3370b4aafd4158cf1604c911

data/README.md

@@ -1,13 +1,13 @@
 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 4. Please see the [`main`](https://github.com/spohlenz/tinymce-rails) branch for TinyMCE 7, and alternate branches for [TinyMCE 6](https://github.com/spohlenz/tinymce-rails/tree/tinymce-6), [TinyMCE 5](https://github.com/spohlenz/tinymce-rails/tree/tinymce-5) & [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?branch=tinymce-4)](https://github.com/spohlenz/tinymce-rails/actions?query=branch%3Atinymce-4)
 
 **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.
 
@@ -52,7 +52,7 @@ alternate:
     - table
 ```
 
-See the [TinyMCE 4 Documentation](https://www.tinymce.com/docs/configure/) for a full list of configuration options.
+See the [TinyMCE 4 Documentation](https://www.tiny.cloud/docs-4x/configure/) for a full list of configuration options.
 
 
 **3. Include the TinyMCE assets**

data/app/assets/source/tinymce/tinymce.js

@@ -1,4 +1,4 @@
-// 4.9.10 (2020-04-23)
+// 4.9.11 (2020-07-13)
 (function () {
 (function (domGlobals) {
     'use strict';
@@ -5657,7 +5657,7 @@
       textBlockElementsMap = createLookupTable('text_block_elements', 'h1 h2 h3 h4 h5 h6 p div address pre form ' + 'blockquote center dir fieldset header footer article section hgroup aside main nav figure');
       blockElementsMap = createLookupTable('block_elements', 'hr table tbody thead tfoot ' + 'th tr td li ol ul caption dl dt dd noscript menu isindex option ' + 'datalist select optgroup figcaption details summary', textBlockElementsMap);
       textInlineElementsMap = createLookupTable('text_inline_elements', 'span strong b em i font strike u var cite ' + 'dfn code mark q sup sub samp');
-      each$4((settings.special || 'script noscript noframes noembed title style textarea xmp').split(' '), function (name) {
+      each$4((settings.special || 'script noscript iframe noframes noembed title style textarea xmp').split(' '), function (name) {
         specialElements[name] = new RegExp('</' + name + '[^>]*>', 'gi');
       });
       var patternToRegExp = function (str) {
@@ -8103,7 +8103,8 @@
       return overflowY >= 0 && overflowY <= Math.min(rect1.height, rect2.height) / 2;
     };
     var isAbove = function (rect1, rect2) {
-      if (rect1.bottom - rect1.height / 2 < rect2.top) {
+      var halfHeight = Math.min(rect2.height / 2, rect1.height / 2);
+      if (rect1.bottom - halfHeight < rect2.top) {
         return true;
       }
       if (rect1.top > rect2.bottom) {
@@ -13290,6 +13291,99 @@
     };
     var InlineFormatDelete = { backspaceDelete: backspaceDelete$5 };
 
+    var getPos$1 = function (elm) {
+      var x = 0, y = 0;
+      var offsetParent = elm;
+      while (offsetParent && offsetParent.nodeType) {
+        x += offsetParent.offsetLeft || 0;
+        y += offsetParent.offsetTop || 0;
+        offsetParent = offsetParent.offsetParent;
+      }
+      return {
+        x: x,
+        y: y
+      };
+    };
+    var fireScrollIntoViewEvent = function (editor, elm, alignToTop) {
+      var scrollEvent = {
+        elm: elm,
+        alignToTop: alignToTop
+      };
+      editor.fire('scrollIntoView', scrollEvent);
+      return scrollEvent.isDefaultPrevented();
+    };
+    var scrollElementIntoView = function (editor, elm, alignToTop) {
+      var y, viewPort;
+      var dom = editor.dom;
+      var root = dom.getRoot();
+      var viewPortY, viewPortH, offsetY = 0;
+      if (fireScrollIntoViewEvent(editor, elm, alignToTop)) {
+        return;
+      }
+      if (!NodeType.isElement(elm)) {
+        return;
+      }
+      if (alignToTop === false) {
+        offsetY = elm.offsetHeight;
+      }
+      if (root.nodeName !== 'BODY') {
+        var scrollContainer = editor.selection.getScrollContainer();
+        if (scrollContainer) {
+          y = getPos$1(elm).y - getPos$1(scrollContainer).y + offsetY;
+          viewPortH = scrollContainer.clientHeight;
+          viewPortY = scrollContainer.scrollTop;
+          if (y < viewPortY || y + 25 > viewPortY + viewPortH) {
+            scrollContainer.scrollTop = y < viewPortY ? y : y - viewPortH + 25;
+          }
+          return;
+        }
+      }
+      viewPort = dom.getViewPort(editor.getWin());
+      y = dom.getPos(elm).y + offsetY;
+      viewPortY = viewPort.y;
+      viewPortH = viewPort.h;
+      if (y < viewPort.y || y + 25 > viewPortY + viewPortH) {
+        editor.getWin().scrollTo(0, y < viewPortY ? y : y - viewPortH + 25);
+      }
+    };
+    var getViewPortRect = function (editor) {
+      if (editor.inline) {
+        return editor.getBody().getBoundingClientRect();
+      } else {
+        var win = editor.getWin();
+        return {
+          left: 0,
+          right: win.innerWidth,
+          top: 0,
+          bottom: win.innerHeight,
+          width: win.innerWidth,
+          height: win.innerHeight
+        };
+      }
+    };
+    var scrollBy = function (editor, dx, dy) {
+      if (editor.inline) {
+        editor.getBody().scrollLeft += dx;
+        editor.getBody().scrollTop += dy;
+      } else {
+        editor.getWin().scrollBy(dx, dy);
+      }
+    };
+    var scrollRangeIntoView = function (editor, rng) {
+      head(CaretPosition.fromRangeStart(rng).getClientRects()).each(function (rngRect) {
+        var bodyRect = getViewPortRect(editor);
+        var overflow = getOverflow(bodyRect, rngRect);
+        var margin = 4;
+        var dx = overflow.x > 0 ? overflow.x + margin : overflow.x - margin;
+        var dy = overflow.y > 0 ? overflow.y + margin : overflow.y - margin;
+        scrollBy(editor, overflow.x !== 0 ? dx : 0, overflow.y !== 0 ? dy : 0);
+      });
+    };
+    var ScrollIntoView = {
+      scrollElementIntoView: scrollElementIntoView,
+      scrollRangeIntoView: scrollRangeIntoView
+    };
+
     var isContentEditableTrue$2 = NodeType.isContentEditableTrue;
     var isContentEditableFalse$6 = NodeType.isContentEditableFalse;
     var showCaret = function (direction, editor, node, before, scrollIntoView) {
@@ -13336,6 +13430,10 @@
       }
       return range;
     };
+    var moveToRange = function (editor, rng) {
+      editor.selection.setRng(rng);
+      ScrollIntoView.scrollRangeIntoView(editor, editor.selection.getRng());
+    };
 
     var trimEmptyTextNode$1 = function (dom, node) {
       if (NodeType.isText(node) && node.data.length === 0) {
@@ -20415,7 +20513,7 @@
           var blockElements = Tools.extend({}, schema.getBlockElements());
           var nonEmptyElements = schema.getNonEmptyElements();
           var parent, lastParent, prev, prevName;
-          var whiteSpaceElements = schema.getNonEmptyElements();
+          var whiteSpaceElements = schema.getWhiteSpaceElements();
           var elementRule, textNode;
           blockElements.body = 1;
           for (i = 0; i < l; i++) {
@@ -21490,99 +21588,6 @@
       };
     };
 
-    var getPos$1 = function (elm) {
-      var x = 0, y = 0;
-      var offsetParent = elm;
-      while (offsetParent && offsetParent.nodeType) {
-        x += offsetParent.offsetLeft || 0;
-        y += offsetParent.offsetTop || 0;
-        offsetParent = offsetParent.offsetParent;
-      }
-      return {
-        x: x,
-        y: y
-      };
-    };
-    var fireScrollIntoViewEvent = function (editor, elm, alignToTop) {
-      var scrollEvent = {
-        elm: elm,
-        alignToTop: alignToTop
-      };
-      editor.fire('scrollIntoView', scrollEvent);
-      return scrollEvent.isDefaultPrevented();
-    };
-    var scrollElementIntoView = function (editor, elm, alignToTop) {
-      var y, viewPort;
-      var dom = editor.dom;
-      var root = dom.getRoot();
-      var viewPortY, viewPortH, offsetY = 0;
-      if (fireScrollIntoViewEvent(editor, elm, alignToTop)) {
-        return;
-      }
-      if (!NodeType.isElement(elm)) {
-        return;
-      }
-      if (alignToTop === false) {
-        offsetY = elm.offsetHeight;
-      }
-      if (root.nodeName !== 'BODY') {
-        var scrollContainer = editor.selection.getScrollContainer();
-        if (scrollContainer) {
-          y = getPos$1(elm).y - getPos$1(scrollContainer).y + offsetY;
-          viewPortH = scrollContainer.clientHeight;
-          viewPortY = scrollContainer.scrollTop;
-          if (y < viewPortY || y + 25 > viewPortY + viewPortH) {
-            scrollContainer.scrollTop = y < viewPortY ? y : y - viewPortH + 25;
-          }
-          return;
-        }
-      }
-      viewPort = dom.getViewPort(editor.getWin());
-      y = dom.getPos(elm).y + offsetY;
-      viewPortY = viewPort.y;
-      viewPortH = viewPort.h;
-      if (y < viewPort.y || y + 25 > viewPortY + viewPortH) {
-        editor.getWin().scrollTo(0, y < viewPortY ? y : y - viewPortH + 25);
-      }
-    };
-    var getViewPortRect = function (editor) {
-      if (editor.inline) {
-        return editor.getBody().getBoundingClientRect();
-      } else {
-        var win = editor.getWin();
-        return {
-          left: 0,
-          right: win.innerWidth,
-          top: 0,
-          bottom: win.innerHeight,
-          width: win.innerWidth,
-          height: win.innerHeight
-        };
-      }
-    };
-    var scrollBy = function (editor, dx, dy) {
-      if (editor.inline) {
-        editor.getBody().scrollLeft += dx;
-        editor.getBody().scrollTop += dy;
-      } else {
-        editor.getWin().scrollBy(dx, dy);
-      }
-    };
-    var scrollRangeIntoView = function (editor, rng) {
-      head(CaretPosition.fromRangeStart(rng).getClientRects()).each(function (rngRect) {
-        var bodyRect = getViewPortRect(editor);
-        var overflow = getOverflow(bodyRect, rngRect);
-        var margin = 4;
-        var dx = overflow.x > 0 ? overflow.x + margin : overflow.x - margin;
-        var dy = overflow.y > 0 ? overflow.y + margin : overflow.y - margin;
-        scrollBy(editor, overflow.x !== 0 ? dx : 0, overflow.y !== 0 ? dy : 0);
-      });
-    };
-    var ScrollIntoView = {
-      scrollElementIntoView: scrollElementIntoView,
-      scrollRangeIntoView: scrollRangeIntoView
-    };
-
     var hasCeProperty = function (node) {
       return NodeType.isContentEditableTrue(node) || NodeType.isContentEditableFalse(node);
     };
@@ -21901,22 +21906,37 @@
     };
     var GetSelectionContent = { getContent: getContent };
 
+    var setupArgs = function (args, content) {
+      return __assign(__assign({ format: 'html' }, args), {
+        set: true,
+        selection: true,
+        content: content
+      });
+    };
+    var cleanContent = function (editor, args) {
+      if (args.format !== 'raw') {
+        var node = editor.parser.parse(args.content, __assign({
+          isRootContent: true,
+          forced_root_block: false
+        }, args));
+        return HtmlSerializer({ validate: editor.validate }, editor.schema).serialize(node);
+      } else {
+        return args.content;
+      }
+    };
     var setContent = function (editor, content, args) {
+      var contentArgs = setupArgs(args, content);
       var rng = editor.selection.getRng(), caretNode;
       var doc = editor.getDoc();
       var frag, temp;
-      args = args || { format: 'html' };
-      args.set = true;
-      args.selection = true;
-      args.content = content;
-      if (!args.no_events) {
-        args = editor.fire('BeforeSetContent', args);
-        if (args.isDefaultPrevented()) {
-          editor.fire('SetContent', args);
+      if (!contentArgs.no_events) {
+        contentArgs = editor.fire('BeforeSetContent', contentArgs);
+        if (contentArgs.isDefaultPrevented()) {
+          editor.fire('SetContent', contentArgs);
           return;
         }
       }
-      content = args.content;
+      content = cleanContent(editor, contentArgs);
       if (rng.insertNode) {
         content += '<span id="__caret">_</span>';
         if (rng.startContainer === doc && rng.endContainer === doc) {
@@ -21948,19 +21968,20 @@
         } catch (ex) {
         }
       } else {
-        if (rng.item) {
+        var anyRng = rng;
+        if (anyRng.item) {
           doc.execCommand('Delete', false, null);
-          rng = editor.getRng();
+          anyRng = editor.selection.getRng();
         }
         if (/^\s+/.test(content)) {
-          rng.pasteHTML('<span id="__mce_tmp">_</span>' + content);
+          anyRng.pasteHTML('<span id="__mce_tmp">_</span>' + content);
           editor.dom.remove('__mce_tmp');
         } else {
-          rng.pasteHTML(content);
+          anyRng.pasteHTML(content);
         }
       }
-      if (!args.no_events) {
-        editor.fire('SetContent', args);
+      if (!contentArgs.no_events) {
+        editor.fire('SetContent', contentArgs);
       }
     };
     var SetSelectionContent = { setContent: setContent };
@@ -22649,7 +22670,7 @@
       return function () {
         var newRng = getHorizontalRange(editor, forward);
         if (newRng) {
-          editor.selection.setRng(newRng);
+          moveToRange(editor, newRng);
           return true;
         } else {
           return false;
@@ -22660,7 +22681,7 @@
       return function () {
         var newRng = getVerticalRange(editor, down);
         if (newRng) {
-          editor.selection.setRng(newRng);
+          moveToRange(editor, newRng);
           return true;
         } else {
           return false;
@@ -22762,10 +22783,6 @@
       });
     };
 
-    var moveToRange = function (editor, rng) {
-      editor.selection.setRng(rng);
-      ScrollIntoView.scrollRangeIntoView(editor, rng);
-    };
     var hasNextBreak = function (getPositionsUntil, scope, lineInfo) {
       return lineInfo.breakAt.map(function (breakPos) {
         return getPositionsUntil(scope, breakPos).breakAt.isSome();
@@ -26364,8 +26381,8 @@
       defaultSettings: {},
       $: DomQuery,
       majorVersion: '4',
-      minorVersion: '9.10',
-      releaseDate: '2020-04-23',
+      minorVersion: '9.11',
+      releaseDate: '2020-07-13',
       editors: legacyEditors,
       i18n: I18n,
       activeEditor: null,

data/lib/tinymce/rails/asset_installer/compile.rb

@@ -24,14 +24,14 @@ module TinyMCE
         def symlink_asset(src, dest)
           with_asset(src, dest) do |src, dest|
             create_symlink(src, dest)
-            create_symlink("#{src}.gz", "#{dest}.gz") if File.exists?("#{src}.gz")
+            create_symlink("#{src}.gz", "#{dest}.gz") if File.exist?("#{src}.gz")
           end
         end
 
         def create_symlink(src, dest)
           target = File.basename(src)
 
-          unless File.exists?(dest) && File.symlink?(dest) && File.readlink(dest) == target
+          unless File.exist?(dest) && File.symlink?(dest) && File.readlink(dest) == target
             logger.info "Creating symlink #{dest}"
             FileUtils.ln_s(target, dest, :force => true)
           else

data/lib/tinymce/rails/asset_installer.rb

@@ -56,7 +56,7 @@ module TinyMCE
           src = File.join(@target, src)
           dest = File.join(@target, dest)
 
-          yield src, dest if File.exists?(src)
+          yield src, dest if File.exist?(src)
         end
       end
     end

data/lib/tinymce/rails/asset_manifest.rb

@@ -6,6 +6,7 @@ module TinyMCE
       def self.load(manifest_path)
         JsonManifest.try(manifest_path, ".sprockets-manifest*.json") ||
           JsonManifest.try(manifest_path, "manifest*.json") ||
+          JsonManifest.try(manifest_path) ||
           YamlManifest.try(manifest_path) ||
           NullManifest.new
       end
@@ -37,7 +38,7 @@ module TinyMCE
     class YamlManifest < AssetManifest
       def self.try(manifest_path)
         yaml_file = File.join(manifest_path, "manifest.yml")
-        new(yaml_file) if File.exists?(yaml_file)
+        new(yaml_file) if File.exist?(yaml_file)
       end
 
       def initialize(file)
@@ -75,9 +76,13 @@ module TinyMCE
     end
 
     class JsonManifest < AssetManifest
-      def self.try(manifest_path, pattern)
-        paths = Dir[File.join(manifest_path, pattern)]
-        new(paths.first) if paths.any?
+      def self.try(manifest_path, pattern=nil)
+        if pattern
+          paths = Dir[File.join(manifest_path, pattern)]
+          new(paths.first) if paths.any?
+        elsif File.file?(manifest_path)
+          new(manifest_path)
+        end
       end
 
       def initialize(file)

data/lib/tinymce/rails/configuration.rb

@@ -14,7 +14,7 @@ module TinyMCE::Rails
       }
     end
 
-    FUNCTION_REGEX = /^function\s*\(/
+    FUNCTION_REGEX = /^function\s*\(([\w\d\s_,]*)\)\s*\{([^}]*)\}|\(([\w\d\s_,]*)\)\s*=>\s*\{([^}]*)\}/
     RELATIVE_PATH_REGEX = /^(\/|\.{1,2})\S*/
 
     COMMA = ",".freeze
@@ -47,7 +47,7 @@ module TinyMCE::Rails
       # Check for files provided in the content_css option to replace them with their actual path.
       # If no corresponding stylesheet is found for a file, it will remain unchanged.
       "content_css" => ->(value) {
-        helpers = ActionView::Base.new(ActionView::LookupContext.new([]))
+        helpers = ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil)
         separator = OPTION_SEPARATORS["content_css"]
 
         value.split(separator).map { |file|

data/lib/tinymce/rails/configuration_file.rb

@@ -25,13 +25,13 @@ module TinyMCE::Rails
     end
 
     def last_updated
-      File.exists?(path) && File.mtime(path)
+      File.exist?(path) && File.mtime(path)
     end
 
     def load_configuration
       @last_loaded = last_updated
 
-      return Configuration.new_with_defaults if !File.exists?(path)
+      return Configuration.new_with_defaults if !File.exist?(path)
 
       options = load_yaml(path)
 
@@ -43,7 +43,8 @@ module TinyMCE::Rails
     end
 
     def load_yaml(path)
-      YAML::load(ERB.new(IO.read(path)).result)
+      result = ERB.new(IO.read(path)).result
+      YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(result) : YAML.load(result)
     end
   end
 end

data/lib/tinymce/rails/version.rb

@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "4.9.10"
-    TINYMCE_VERSION = "4.9.10"
+    VERSION = "4.9.11.1"
+    TINYMCE_VERSION = "4.9.11"
   end
 end