tinymce-rails 4.9.1 → 4.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3079c9866499fc43b5bf43774db579270baac6e0fa856b3d1d835650aec27601
-  data.tar.gz: da19e8bb905cde58f2374cc18176f79fb2e77e2cbf0f57be1f2a0c5d9160f202
+  metadata.gz: 62c0d0894eb083b9ea5d18b901aa92845f57f6cb21f893d691058b2fe105bd02
+  data.tar.gz: 931fe3122860185e6bb505043351a2288f5f0c7c184f31f8c50e5aedb3ca39a2
 SHA512:
-  metadata.gz: 9d957020bd612073d5fd41676466b885e1f0dda1d3f46a5b8239229e385e0f35eda4899a89aed13bf81486168c0e7bcfdcf439bb9dcf1a3767ee87291a3d4ebe
-  data.tar.gz: 9199afbfd057b4b824b902387a7dc71ae834277fb185c6610cd84df39d627f8c2afd026a6bcb44fb672d265d14ba43f711f124985448cd2cda71e89e49e8dad0
+  metadata.gz: 846e670a022114035cd5c8b95aaf2eebd8db1235ca9bb6264dc1a1178d0b4bd3ad4a34e0f97eb669985f6006e50095e5b1f6daf134136862334bfc1ebe08c68f
+  data.tar.gz: 9ca36f46e47ba9689fe1f7607ed43f11287e1c068bd508e07783409c07679ec8430ce565401a4c7a1cb32e7af187850f0b83cd75585cb7cbe46e7711f5f5e048

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

@@ -1,4 +1,4 @@
-// 4.9.1 (2018-12-04)
+// 4.9.2 (2018-12-17)
 (function () {
 (function () {
     'use strict';
@@ -6901,6 +6901,14 @@
         before(v, element);
       });
     };
+    var prepend = function (parent$$1, element) {
+      var firstChild$$1 = firstChild(parent$$1);
+      firstChild$$1.fold(function () {
+        append(parent$$1, element);
+      }, function (v) {
+        parent$$1.dom().insertBefore(element.dom(), v.dom());
+      });
+    };
     var append = function (parent$$1, element) {
       parent$$1.dom().appendChild(element.dom());
     };
@@ -7065,6 +7073,17 @@
       return supports(element) && element.dom().classList.contains(clazz);
     };
 
+    var descendants = function (scope, predicate) {
+      var result = [];
+      each(children(scope), function (x) {
+        if (predicate(x)) {
+          result = result.concat([x]);
+        }
+        result = result.concat(descendants(x, predicate));
+      });
+      return result;
+    };
+
     var descendants$1 = function (scope, selector) {
       return all(selector, scope);
     };
@@ -8799,19 +8818,17 @@
       }
       return CaretPosition$1.before(node);
     };
-    var isBrBeforeBlock = function (node, root) {
-      var next;
-      if (!NodeType.isBr(node)) {
-        return false;
-      }
-      if (isAtomic(node.nextSibling)) {
-        return false;
-      }
-      next = findCaretPosition(HDirection.Forwards, CaretPosition$1.after(node), root);
-      if (!next) {
-        return false;
+    var moveForwardFromBr = function (root, nextNode) {
+      var nextSibling = nextNode.nextSibling;
+      if (nextSibling && isCaretCandidate$3(nextSibling)) {
+        if (isText$7(nextSibling)) {
+          return CaretPosition$1(nextSibling, 0);
+        } else {
+          return CaretPosition$1.before(nextSibling);
+        }
+      } else {
+        return findCaretPosition(HDirection.Forwards, CaretPosition$1.after(nextNode), root);
       }
-      return !isInSameBlock(CaretPosition$1.before(node), CaretPosition$1.before(next), root);
     };
     var findCaretPosition = function (direction, startPos, root) {
       var node, nextNode, innerNode;
@@ -8859,11 +8876,8 @@
         if (isForwards(direction) && offset < container.childNodes.length) {
           nextNode = nodeAtIndex(container, offset);
           if (isCaretCandidate$3(nextNode)) {
-            if (isBr$4(nextNode) && root.lastChild === nextNode) {
-              return null;
-            }
-            if (isBrBeforeBlock(nextNode, root)) {
-              return findCaretPosition(direction, CaretPosition$1.after(nextNode), root);
+            if (isBr$4(nextNode)) {
+              return moveForwardFromBr(root, nextNode);
             }
             if (!isAtomic$1(nextNode)) {
               innerNode = findNode(nextNode, direction, isEditableCaretCandidate$1, nextNode);
@@ -12924,6 +12938,9 @@
       }
     ]);
     var range$1 = Immutable('start', 'soffset', 'finish', 'foffset');
+    var domRange = type$1.domRange;
+    var relative = type$1.relative;
+    var exact = type$1.exact;
 
     var browser$3 = PlatformDetection$1.detect().browser;
     var clamp = function (offset, element) {
@@ -17594,6 +17611,9 @@
     var isTableCell$4 = function (node) {
       return /^(TH|TD)$/.test(node.nodeName);
     };
+    var isChildOfInlineParent = function (dom, node, parent$$1) {
+      return dom.isChildOf(node, parent$$1) && node !== parent$$1 && !dom.isBlock(parent$$1);
+    };
     var getContainer = function (ed, rng, start) {
       var container, offset, lastIdx;
       container = rng[start ? 'startContainer' : 'endContainer'];
@@ -17619,19 +17639,19 @@
       wrapper.appendChild(node);
       return wrapper;
     };
-    var wrapWithSiblings = function (dom, startNode, name, next, attrs) {
-      var direction = (next ? 'next' : 'previous') + 'Sibling';
-      var wrapper = dom.create(name, attrs);
-      startNode.parentNode.insertBefore(wrapper, startNode);
-      var nodesToWrap = [startNode];
-      var currNode = startNode;
-      while (currNode = currNode[direction]) {
-        nodesToWrap.push(currNode);
+    var wrapWithSiblings = function (dom, node, next, name, attrs) {
+      var start = Element$$1.fromDom(node);
+      var wrapper = Element$$1.fromDom(dom.create(name, attrs));
+      var siblings$$1 = next ? nextSiblings(start) : prevSiblings(start);
+      append$1(wrapper, siblings$$1);
+      if (next) {
+        before(start, wrapper);
+        prepend(wrapper, start);
+      } else {
+        after(start, wrapper);
+        append(wrapper, start);
       }
-      nodesToWrap.forEach(function (node) {
-        return wrapper.appendChild(node);
-      });
-      return wrapper;
+      return wrapper.dom();
     };
     var matchName$1 = function (dom, node, format) {
       if (isEq$5(node, format.inline)) {
@@ -17764,24 +17784,24 @@
     };
     var findFormatRoot = function (editor, container, name, vars, similar) {
       var formatRoot;
-      each$d(FormatUtils.getParents(editor.dom, container.parentNode).reverse(), function (parent) {
+      each$d(FormatUtils.getParents(editor.dom, container.parentNode).reverse(), function (parent$$1) {
         var format;
-        if (!formatRoot && parent.id !== '_start' && parent.id !== '_end') {
-          format = MatchFormat.matchNode(editor, parent, name, vars, similar);
+        if (!formatRoot && parent$$1.id !== '_start' && parent$$1.id !== '_end') {
+          format = MatchFormat.matchNode(editor, parent$$1, name, vars, similar);
           if (format && format.split !== false) {
-            formatRoot = parent;
+            formatRoot = parent$$1;
           }
         }
       });
       return formatRoot;
     };
     var wrapAndSplit = function (editor, formatList, formatRoot, container, target, split, format, vars) {
-      var parent, clone, lastClone, firstClone, i, formatRootParent;
+      var parent$$1, clone, lastClone, firstClone, i, formatRootParent;
       var dom = editor.dom;
       if (formatRoot) {
         formatRootParent = formatRoot.parentNode;
-        for (parent = container.parentNode; parent && parent !== formatRootParent; parent = parent.parentNode) {
-          clone = dom.clone(parent, false);
+        for (parent$$1 = container.parentNode; parent$$1 && parent$$1 !== formatRootParent; parent$$1 = parent$$1.parentNode) {
+          clone = dom.clone(parent$$1, false);
           for (i = 0; i < formatList.length; i++) {
             if (removeFormat(editor, formatList[i], vars, clone, clone)) {
               clone = 0;
@@ -17821,13 +17841,13 @@
         return Bookmarks.isBookmarkNode(node) && NodeType.isElement(node) && (node.id === '_start' || node.id === '_end');
       };
       var process = function (node) {
-        var children, i, l, lastContentEditable, hasContentEditableState;
+        var children$$1, i, l, lastContentEditable, hasContentEditableState;
         if (NodeType.isElement(node) && dom.getContentEditable(node)) {
           lastContentEditable = contentEditable;
           contentEditable = dom.getContentEditable(node) === 'true';
           hasContentEditableState = true;
         }
-        children = Tools.grep(node.childNodes);
+        children$$1 = Tools.grep(node.childNodes);
         if (contentEditable && !hasContentEditableState) {
           for (i = 0, l = formatList.length; i < l; i++) {
             if (removeFormat(ed, formatList[i], vars, node, node)) {
@@ -17836,9 +17856,9 @@
           }
         }
         if (format.deep) {
-          if (children.length) {
-            for (i = 0, l = children.length; i < l; i++) {
-              process(children[i]);
+          if (children$$1.length) {
+            for (i = 0, l = children$$1.length; i < l; i++) {
+              process(children$$1[i]);
             }
             if (hasContentEditableState) {
               contentEditable = lastContentEditable;
@@ -17877,13 +17897,22 @@
             if (commonAncestorContainer && /^T(HEAD|BODY|FOOT|R)$/.test(commonAncestorContainer.nodeName) && isTableCell$4(endContainer) && endContainer.firstChild) {
               endContainer = endContainer.firstChild || endContainer;
             }
-            if (dom.isChildOf(startContainer, endContainer) && startContainer !== endContainer && !dom.isBlock(endContainer) && !isTableCell$4(startContainer) && !isTableCell$4(endContainer)) {
-              var wrappedContent = wrapWithSiblings(dom, startContainer, 'span', true, {
+            if (isChildOfInlineParent(dom, startContainer, endContainer)) {
+              var marker = Option.from(startContainer.firstChild).getOr(startContainer);
+              splitToFormatRoot(wrapWithSiblings(dom, marker, true, 'span', {
                 'id': '_start',
                 'data-mce-type': 'bookmark'
-              });
-              splitToFormatRoot(wrappedContent);
-              startContainer = unwrap(true);
+              }));
+              unwrap(true);
+              return;
+            }
+            if (isChildOfInlineParent(dom, endContainer, startContainer)) {
+              var marker = Option.from(endContainer.lastChild).getOr(endContainer);
+              splitToFormatRoot(wrapWithSiblings(dom, marker, false, 'span', {
+                'id': '_end',
+                'data-mce-type': 'bookmark'
+              }));
+              unwrap(false);
               return;
             }
             startContainer = wrap$2(dom, startContainer, 'span', {
@@ -19801,6 +19830,7 @@
       };
       var filterNode = function (node) {
         var i, name, list;
+        name = node.name;
         if (name in nodeFilters) {
           list = matchedNodes[name];
           if (list) {
@@ -21806,6 +21836,12 @@
     };
     var getPositionsUntilPreviousLine = curry(getPositionsUntil, CaretPosition.isAbove, -1);
     var getPositionsUntilNextLine = curry(getPositionsUntil, CaretPosition.isBelow, 1);
+    var isAtFirstLine = function (scope, pos) {
+      return getPositionsUntilPreviousLine(scope, pos).breakAt.isNone();
+    };
+    var isAtLastLine = function (scope, pos) {
+      return getPositionsUntilNextLine(scope, pos).breakAt.isNone();
+    };
     var getPositionsAbove = curry(getAdjacentLinePositions, -1, getPositionsUntilPreviousLine);
     var getPositionsBelow = curry(getAdjacentLinePositions, 1, getPositionsUntilNextLine);
     var getFirstLinePositions = function (scope) {
@@ -22027,6 +22063,74 @@
       };
     };
 
+    var isTarget = function (node) {
+      return contains(['figcaption'], name(node));
+    };
+    var rangeBefore = function (target) {
+      var rng = document.createRange();
+      rng.setStartBefore(target.dom());
+      rng.setEndBefore(target.dom());
+      return rng;
+    };
+    var insertElement = function (root, elm, forward) {
+      if (forward) {
+        append(root, elm);
+      } else {
+        prepend(root, elm);
+      }
+    };
+    var insertBr = function (root, forward) {
+      var br = Element$$1.fromTag('br');
+      insertElement(root, br, forward);
+      return rangeBefore(br);
+    };
+    var insertBlock$1 = function (root, forward, blockName, attrs) {
+      var block = Element$$1.fromTag(blockName);
+      var br = Element$$1.fromTag('br');
+      setAll(block, attrs);
+      append(block, br);
+      insertElement(root, block, forward);
+      return rangeBefore(br);
+    };
+    var insertEmptyLine = function (root, rootBlockName, attrs, forward) {
+      if (rootBlockName === '') {
+        return insertBr(root, forward);
+      } else {
+        return insertBlock$1(root, forward, rootBlockName, attrs);
+      }
+    };
+    var getClosestTargetBlock = function (pos, root) {
+      var isRoot = curry(eq, root);
+      return closest(Element$$1.fromDom(pos.container()), isBlock, isRoot).filter(isTarget);
+    };
+    var isAtFirstOrLastLine = function (root, forward, pos) {
+      return forward ? isAtLastLine(root.dom(), pos) : isAtFirstLine(root.dom(), pos);
+    };
+    var moveCaretToNewEmptyLine = function (editor, forward) {
+      var root = Element$$1.fromDom(editor.getBody());
+      var pos = CaretPosition$1.fromRangeStart(editor.selection.getRng());
+      var rootBlock = Settings.getForcedRootBlock(editor);
+      var rootBlockAttrs = Settings.getForcedRootBlockAttrs(editor);
+      return getClosestTargetBlock(pos, root).exists(function () {
+        if (isAtFirstOrLastLine(root, forward, pos)) {
+          var rng = insertEmptyLine(root, rootBlock, rootBlockAttrs, forward);
+          editor.selection.setRng(rng);
+          return true;
+        } else {
+          return false;
+        }
+      });
+    };
+    var moveV$2 = function (editor, forward) {
+      return function () {
+        if (editor.selection.isCollapsed()) {
+          return moveCaretToNewEmptyLine(editor, forward);
+        } else {
+          return false;
+        }
+      };
+    };
+
     var defaultPatterns = function (patterns) {
       return map(patterns, function (pattern) {
         return merge({
@@ -22122,6 +22226,14 @@
           ctrlKey: !os.isOSX(),
           altKey: os.isOSX(),
           action: BoundarySelection.movePrevWord(editor, caret)
+        },
+        {
+          keyCode: VK.UP,
+          action: moveV$2(editor, false)
+        },
+        {
+          keyCode: VK.DOWN,
+          action: moveV$2(editor, true)
         }
       ], evt).each(function (_) {
         evt.preventDefault();
@@ -22424,8 +22536,14 @@
     };
     var InsertLi = { insert: insert$1 };
 
-    var isEmptyAnchor = function (elm) {
-      return elm && elm.nodeName === 'A' && Tools.trim(Zwsp.trim(elm.innerText || elm.textContent)).length === 0;
+    var trimZwsp = function (fragment) {
+      each(descendants(Element$$1.fromDom(fragment), isText), function (text) {
+        var rawNode = text.dom();
+        rawNode.nodeValue = Zwsp.trim(rawNode.nodeValue);
+      });
+    };
+    var isEmptyAnchor = function (dom, elm) {
+      return elm && elm.nodeName === 'A' && dom.isEmpty(elm);
     };
     var isTableCell$5 = function (node) {
       return node && /^(TD|TH|CAPTION)$/.test(node.nodeName);
@@ -22460,7 +22578,7 @@
         if (!node.hasChildNodes() || node.firstChild === node.lastChild && node.firstChild.nodeValue === '') {
           dom.remove(node);
         } else {
-          if (isEmptyAnchor(node)) {
+          if (isEmptyAnchor(dom, node)) {
             dom.remove(node);
           }
         }
@@ -22565,11 +22683,11 @@
       var dom = editor.dom;
       var schema = editor.schema, nonEmptyElementsMap = schema.getNonEmptyElements();
       var rng = editor.selection.getRng();
-      var createNewBlock = function (name) {
+      var createNewBlock = function (name$$1) {
         var node = container, block, clonedNode, caretNode;
         var textInlineElements = schema.getTextInlineElements();
-        if (name || parentBlockName === 'TABLE' || parentBlockName === 'HR') {
-          block = dom.create(name || newBlockName);
+        if (name$$1 || parentBlockName === 'TABLE' || parentBlockName === 'HR') {
+          block = dom.create(name$$1 || newBlockName);
           setForcedBlockAttrs(editor, block);
         } else {
           block = parentBlock.cloneNode(false);
@@ -22600,7 +22718,7 @@
         return block;
       };
       var isCaretAtStartOrEndOfBlock = function (start) {
-        var walker, node, name, normalizedOffset;
+        var walker, node, name$$1, normalizedOffset;
         normalizedOffset = normalizeZwspOffset(start, container, offset);
         if (NodeType.isText(container) && (start ? normalizedOffset > 0 : normalizedOffset < container.nodeValue.length)) {
           return false;
@@ -22625,8 +22743,8 @@
         while (node = walker.current()) {
           if (NodeType.isElement(node)) {
             if (!node.getAttribute('data-mce-bogus')) {
-              name = node.nodeName.toLowerCase();
-              if (nonEmptyElementsMap[name] && name !== 'br') {
+              name$$1 = node.nodeName.toLowerCase();
+              if (nonEmptyElementsMap[name$$1] && name$$1 !== 'br') {
                 return false;
               }
             }
@@ -22712,6 +22830,7 @@
         tmpRng = includeZwspInRange(rng).cloneRange();
         tmpRng.setEndAfter(parentBlock);
         fragment = tmpRng.extractContents();
+        trimZwsp(fragment);
         trimLeadingLineBreaks(fragment);
         newBlock = fragment.firstChild;
         dom.insertAfter(fragment, parentBlock);
@@ -22911,7 +23030,7 @@
     var isAtBlockBoundary = function (forward, root, pos) {
       var parentBlocks = filter(Parents.parentsAndSelf(Element$$1.fromDom(pos.container()), root), isBlock);
       return head(parentBlocks).fold(function () {
-        return CaretFinder.navigate(forward, root.dom(), pos).exists(function (newPos) {
+        return CaretFinder.navigate(forward, root.dom(), pos).forall(function (newPos) {
           return isInSameBlock(newPos, pos, root.dom()) === false;
         });
       }, function (parent) {
@@ -23041,9 +23160,6 @@
       }
     };
 
-    var insertSpaceOrNbspAtPosition = function (root, pos) {
-      return needsToHaveNbsp(root, pos) ? insertNbspAtPosition(pos) : insertSpaceAtPosition(pos);
-    };
     var locationToCaretPosition = function (root) {
       return function (location) {
         return location.fold(function (element) {
@@ -23075,9 +23191,7 @@
       if (editor.selection.isCollapsed()) {
         var isInlineTarget = curry(InlineUtils.isInlineTarget, editor);
         var caretPosition = CaretPosition$1.fromRangeStart(editor.selection.getRng());
-        return BoundaryLocation.readLocation(isInlineTarget, editor.getBody(), caretPosition).bind(locationToCaretPosition(root)).bind(insertInlineBoundarySpaceOrNbsp(root, pos)).fold(function () {
-          return insertSpaceOrNbspAtPosition(root, pos).map(setSelection$1(editor)).getOr(false);
-        }, setSelection$1(editor));
+        return BoundaryLocation.readLocation(isInlineTarget, editor.getBody(), caretPosition).bind(locationToCaretPosition(root)).bind(insertInlineBoundarySpaceOrNbsp(root, pos)).exists(setSelection$1(editor));
       } else {
         return false;
       }
@@ -23136,7 +23250,24 @@
     };
     var CaretContainerInput = { setup: setup$b };
 
+    var browser$4 = PlatformDetection$1.detect().browser;
+    var setupIeInput = function (editor) {
+      var keypressThrotter = first$1(function () {
+        if (!editor.composing) {
+          normalizeNbspsInEditor(editor);
+        }
+      }, 0);
+      if (browser$4.isIE()) {
+        editor.on('keypress', function (e) {
+          keypressThrotter.throttle();
+        });
+        editor.on('remove', function (e) {
+          keypressThrotter.cancel();
+        });
+      }
+    };
     var setup$c = function (editor) {
+      setupIeInput(editor);
       editor.on('input', function (e) {
         if (e.isComposing === false) {
           normalizeNbspsInEditor(editor);
@@ -25389,8 +25520,8 @@
       defaultSettings: {},
       $: DomQuery,
       majorVersion: '4',
-      minorVersion: '9.1',
-      releaseDate: '2018-12-04',
+      minorVersion: '9.2',
+      releaseDate: '2018-12-17',
       editors: legacyEditors,
       i18n: I18n,
       activeEditor: null,