tinymce-rails 5.1.5 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203779fa7ed0935f03b670b710ad5fb44c95c2f66a23c82fad393841ee68e53f
-  data.tar.gz: ef77eae72fc9c2e5d1a094c1354fdaaf62c0cf077d9985839f0eb2009c7a5d77
+  metadata.gz: 8c40a7a4dcf3eab50b32baefafccd198375b60b45fa4d88045eee219397f6290
+  data.tar.gz: b2677f3838c755145b9307e1efab0a4fc00e2c9267c9f8ae3246b8238fcf7221
 SHA512:
-  metadata.gz: be254e259a159526a5381e11fa4880e890df0ed2a6e374c82f410440373179be5780a6db5edacec944b5c8186d48850ac3ffc962c538c280d5f485e7bc8d2a62
-  data.tar.gz: 3941072580e700cee867ac176fa1f22eda9e87093d0725d7dd769b025117bb2e23a5f88d12b7427b83f7d8efc741c22e58a1367c12bd39a1452973eb960a33de
+  metadata.gz: 9ad3c45fc5f4bc23840cecffcc6c78cdc38f665494ffa18f7ba73396bf045cc44ccfaa3fd1aa4c8734637893cb62c156d3d441ca39e93125b4fa0571b7218c99
+  data.tar.gz: ef73edd26b642107bdf253d9f4b4008131ea32a1cb4b2bf894c290abffe31cf52188d93125aa6d5f7637e2c2b2d5e6d2ed351f0d1fa7f8c2c65d161375eded7a

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

@@ -4,7 +4,7 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  *
- * Version: 5.1.5 (2019-12-19)
+ * Version: 5.1.6 (2020-01-28)
  */
 (function (domGlobals) {
     'use strict';
@@ -588,6 +588,7 @@
     var osx = 'OSX';
     var solaris = 'Solaris';
     var freebsd = 'FreeBSD';
+    var chromeos = 'ChromeOS';
     var isOS = function (name, current) {
       return function () {
         return current === name;
@@ -611,7 +612,8 @@
         isOSX: isOS(osx, current),
         isLinux: isOS(linux, current),
         isSolaris: isOS(solaris, current),
-        isFreeBSD: isOS(freebsd, current)
+        isFreeBSD: isOS(freebsd, current),
+        isChromeOS: isOS(chromeos, current)
       };
     };
     var OperatingSystem = {
@@ -623,7 +625,8 @@
       linux: constant(linux),
       osx: constant(osx),
       solaris: constant(solaris),
-      freebsd: constant(freebsd)
+      freebsd: constant(freebsd),
+      chromeos: constant(chromeos)
     };
 
     var DeviceType = function (os, browser, userAgent, mediaMatch) {
@@ -785,8 +788,8 @@
       },
       {
         name: 'OSX',
-        search: checkContains('os x'),
-        versionRegexes: [/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]
+        search: checkContains('mac os x'),
+        versionRegexes: [/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]
       },
       {
         name: 'Linux',
@@ -802,6 +805,11 @@
         name: 'FreeBSD',
         search: checkContains('freebsd'),
         versionRegexes: []
+      },
+      {
+        name: 'ChromeOS',
+        search: checkContains('cros'),
+        versionRegexes: [/.*?chrome\/([0-9]+)\.([0-9]+).*/]
       }
     ];
     var PlatformInfo = {
@@ -974,6 +982,9 @@
       var v = element.dom().getAttribute(key);
       return v === null ? undefined : v;
     };
+    var getOpt = function (element, key) {
+      return Option.from(get$1(element, key));
+    };
     var has$1 = function (element, key) {
       var dom = element.dom();
       return dom && dom.hasAttribute ? dom.hasAttribute(key) : false;
@@ -2272,6 +2283,7 @@
         current: os.current,
         version: os.version,
         isAndroid: os.isAndroid,
+        isChromeOS: os.isChromeOS,
         isFreeBSD: os.isFreeBSD,
         isiOS: os.isiOS,
         isLinux: os.isLinux,
@@ -10793,7 +10805,7 @@
       return name.indexOf('data-') === 0 || name.indexOf('aria-') === 0;
     };
     var trimComments = function (text) {
-      return text.replace(/<!--|-->/g, '');
+      return text.replace(/<!--|--!?>/g, '');
     };
     var isInvalidUri = function (settings, uri) {
       if (settings.allow_html_data_urls) {
@@ -12977,135 +12989,6 @@
 
     var ThemeManager = AddOnManager$1.ThemeManager;
 
-    function Uploader(uploadStatus, settings) {
-      var pendingPromises = {};
-      var pathJoin = function (path1, path2) {
-        if (path1) {
-          return path1.replace(/\/$/, '') + '/' + path2.replace(/^\//, '');
-        }
-        return path2;
-      };
-      var defaultHandler = function (blobInfo, success, failure, progress) {
-        var xhr, formData;
-        xhr = new domGlobals.XMLHttpRequest();
-        xhr.open('POST', settings.url);
-        xhr.withCredentials = settings.credentials;
-        xhr.upload.onprogress = function (e) {
-          progress(e.loaded / e.total * 100);
-        };
-        xhr.onerror = function () {
-          failure('Image upload failed due to a XHR Transport error. Code: ' + xhr.status);
-        };
-        xhr.onload = function () {
-          var json;
-          if (xhr.status < 200 || xhr.status >= 300) {
-            failure('HTTP Error: ' + xhr.status);
-            return;
-          }
-          json = JSON.parse(xhr.responseText);
-          if (!json || typeof json.location !== 'string') {
-            failure('Invalid JSON: ' + xhr.responseText);
-            return;
-          }
-          success(pathJoin(settings.basePath, json.location));
-        };
-        formData = new domGlobals.FormData();
-        formData.append('file', blobInfo.blob(), blobInfo.filename());
-        xhr.send(formData);
-      };
-      var noUpload = function () {
-        return new promiseObj(function (resolve) {
-          resolve([]);
-        });
-      };
-      var handlerSuccess = function (blobInfo, url) {
-        return {
-          url: url,
-          blobInfo: blobInfo,
-          status: true
-        };
-      };
-      var handlerFailure = function (blobInfo, error) {
-        return {
-          url: '',
-          blobInfo: blobInfo,
-          status: false,
-          error: error
-        };
-      };
-      var resolvePending = function (blobUri, result) {
-        Tools.each(pendingPromises[blobUri], function (resolve) {
-          resolve(result);
-        });
-        delete pendingPromises[blobUri];
-      };
-      var uploadBlobInfo = function (blobInfo, handler, openNotification) {
-        uploadStatus.markPending(blobInfo.blobUri());
-        return new promiseObj(function (resolve) {
-          var notification, progress;
-          var noop = function () {
-          };
-          try {
-            var closeNotification_1 = function () {
-              if (notification) {
-                notification.close();
-                progress = noop;
-              }
-            };
-            var success = function (url) {
-              closeNotification_1();
-              uploadStatus.markUploaded(blobInfo.blobUri(), url);
-              resolvePending(blobInfo.blobUri(), handlerSuccess(blobInfo, url));
-              resolve(handlerSuccess(blobInfo, url));
-            };
-            var failure = function (error) {
-              closeNotification_1();
-              uploadStatus.removeFailed(blobInfo.blobUri());
-              resolvePending(blobInfo.blobUri(), handlerFailure(blobInfo, error));
-              resolve(handlerFailure(blobInfo, error));
-            };
-            progress = function (percent) {
-              if (percent < 0 || percent > 100) {
-                return;
-              }
-              if (!notification) {
-                notification = openNotification();
-              }
-              notification.progressBar.value(percent);
-            };
-            handler(blobInfo, success, failure, progress);
-          } catch (ex) {
-            resolve(handlerFailure(blobInfo, ex.message));
-          }
-        });
-      };
-      var isDefaultHandler = function (handler) {
-        return handler === defaultHandler;
-      };
-      var pendingUploadBlobInfo = function (blobInfo) {
-        var blobUri = blobInfo.blobUri();
-        return new promiseObj(function (resolve) {
-          pendingPromises[blobUri] = pendingPromises[blobUri] || [];
-          pendingPromises[blobUri].push(resolve);
-        });
-      };
-      var uploadBlobs = function (blobInfos, openNotification) {
-        blobInfos = Tools.grep(blobInfos, function (blobInfo) {
-          return !uploadStatus.isUploaded(blobInfo.blobUri());
-        });
-        return promiseObj.all(Tools.map(blobInfos, function (blobInfo) {
-          return uploadStatus.isPending(blobInfo.blobUri()) ? pendingUploadBlobInfo(blobInfo) : uploadBlobInfo(blobInfo, settings.handler, openNotification);
-        }));
-      };
-      var upload = function (blobInfos, openNotification) {
-        return !settings.url && isDefaultHandler(settings.handler) ? noUpload() : uploadBlobs(blobInfos, openNotification);
-      };
-      if (isFunction(settings.handler) === false) {
-        settings.handler = defaultHandler;
-      }
-      return { upload: upload };
-    }
-
     var blobUriToBlob = function (url) {
       return new promiseObj(function (resolve, reject) {
         var rejectWithError = function () {
@@ -13297,105 +13180,134 @@
       return { findAll: findAll };
     }
 
-    var count$1 = 0;
-    var seed = function () {
-      var rnd = function () {
-        return Math.round(Math.random() * 4294967295).toString(36);
+    function Uploader(uploadStatus, settings) {
+      var pendingPromises = {};
+      var pathJoin = function (path1, path2) {
+        if (path1) {
+          return path1.replace(/\/$/, '') + '/' + path2.replace(/^\//, '');
+        }
+        return path2;
       };
-      var now = new Date().getTime();
-      return 's' + now.toString(36) + rnd() + rnd() + rnd();
-    };
-    var uuid = function (prefix) {
-      return prefix + count$1++ + seed();
-    };
-    var Uuid = { uuid: uuid };
-
-    var BlobCache = function () {
-      var cache = [];
-      var mimeToExt = function (mime) {
-        var mimes = {
-          'image/jpeg': 'jpg',
-          'image/jpg': 'jpg',
-          'image/gif': 'gif',
-          'image/png': 'png'
+      var defaultHandler = function (blobInfo, success, failure, progress) {
+        var xhr, formData;
+        xhr = new domGlobals.XMLHttpRequest();
+        xhr.open('POST', settings.url);
+        xhr.withCredentials = settings.credentials;
+        xhr.upload.onprogress = function (e) {
+          progress(e.loaded / e.total * 100);
         };
-        return mimes[mime.toLowerCase()] || 'dat';
+        xhr.onerror = function () {
+          failure('Image upload failed due to a XHR Transport error. Code: ' + xhr.status);
+        };
+        xhr.onload = function () {
+          var json;
+          if (xhr.status < 200 || xhr.status >= 300) {
+            failure('HTTP Error: ' + xhr.status);
+            return;
+          }
+          json = JSON.parse(xhr.responseText);
+          if (!json || typeof json.location !== 'string') {
+            failure('Invalid JSON: ' + xhr.responseText);
+            return;
+          }
+          success(pathJoin(settings.basePath, json.location));
+        };
+        formData = new domGlobals.FormData();
+        formData.append('file', blobInfo.blob(), blobInfo.filename());
+        xhr.send(formData);
       };
-      var create = function (o, blob, base64, filename) {
-        if (isString(o)) {
-          var id = o;
-          return toBlobInfo({
-            id: id,
-            name: filename,
-            blob: blob,
-            base64: base64
-          });
-        } else if (isObject(o)) {
-          return toBlobInfo(o);
-        } else {
-          throw new Error('Unknown input type');
-        }
+      var noUpload = function () {
+        return new promiseObj(function (resolve) {
+          resolve([]);
+        });
       };
-      var toBlobInfo = function (o) {
-        var id, name;
-        if (!o.blob || !o.base64) {
-          throw new Error('blob and base64 representations of the image are required for BlobInfo to be created');
-        }
-        id = o.id || Uuid.uuid('blobid');
-        name = o.name || id;
+      var handlerSuccess = function (blobInfo, url) {
         return {
-          id: constant(id),
-          name: constant(name),
-          filename: constant(name + '.' + mimeToExt(o.blob.type)),
-          blob: constant(o.blob),
-          base64: constant(o.base64),
-          blobUri: constant(o.blobUri || domGlobals.URL.createObjectURL(o.blob)),
-          uri: constant(o.uri)
+          url: url,
+          blobInfo: blobInfo,
+          status: true
         };
       };
-      var add = function (blobInfo) {
-        if (!get(blobInfo.id())) {
-          cache.push(blobInfo);
-        }
-      };
-      var get = function (id) {
-        return findFirst(function (cachedBlobInfo) {
-          return cachedBlobInfo.id() === id;
-        });
-      };
-      var findFirst = function (predicate) {
-        return filter(cache, predicate)[0];
+      var handlerFailure = function (blobInfo, error) {
+        return {
+          url: '',
+          blobInfo: blobInfo,
+          status: false,
+          error: error
+        };
       };
-      var getByUri = function (blobUri) {
-        return findFirst(function (blobInfo) {
-          return blobInfo.blobUri() === blobUri;
+      var resolvePending = function (blobUri, result) {
+        Tools.each(pendingPromises[blobUri], function (resolve) {
+          resolve(result);
         });
+        delete pendingPromises[blobUri];
       };
-      var removeByUri = function (blobUri) {
-        cache = filter(cache, function (blobInfo) {
-          if (blobInfo.blobUri() === blobUri) {
-            domGlobals.URL.revokeObjectURL(blobInfo.blobUri());
-            return false;
-          }
-          return true;
-        });
+      var uploadBlobInfo = function (blobInfo, handler, openNotification) {
+        uploadStatus.markPending(blobInfo.blobUri());
+        return new promiseObj(function (resolve) {
+          var notification, progress;
+          var noop = function () {
+          };
+          try {
+            var closeNotification_1 = function () {
+              if (notification) {
+                notification.close();
+                progress = noop;
+              }
+            };
+            var success = function (url) {
+              closeNotification_1();
+              uploadStatus.markUploaded(blobInfo.blobUri(), url);
+              resolvePending(blobInfo.blobUri(), handlerSuccess(blobInfo, url));
+              resolve(handlerSuccess(blobInfo, url));
+            };
+            var failure = function (error) {
+              closeNotification_1();
+              uploadStatus.removeFailed(blobInfo.blobUri());
+              resolvePending(blobInfo.blobUri(), handlerFailure(blobInfo, error));
+              resolve(handlerFailure(blobInfo, error));
+            };
+            progress = function (percent) {
+              if (percent < 0 || percent > 100) {
+                return;
+              }
+              if (!notification) {
+                notification = openNotification();
+              }
+              notification.progressBar.value(percent);
+            };
+            handler(blobInfo, success, failure, progress);
+          } catch (ex) {
+            resolve(handlerFailure(blobInfo, ex.message));
+          }
+        });
       };
-      var destroy = function () {
-        each(cache, function (cachedBlobInfo) {
-          domGlobals.URL.revokeObjectURL(cachedBlobInfo.blobUri());
+      var isDefaultHandler = function (handler) {
+        return handler === defaultHandler;
+      };
+      var pendingUploadBlobInfo = function (blobInfo) {
+        var blobUri = blobInfo.blobUri();
+        return new promiseObj(function (resolve) {
+          pendingPromises[blobUri] = pendingPromises[blobUri] || [];
+          pendingPromises[blobUri].push(resolve);
         });
-        cache = [];
       };
-      return {
-        create: create,
-        add: add,
-        get: get,
-        getByUri: getByUri,
-        findFirst: findFirst,
-        removeByUri: removeByUri,
-        destroy: destroy
+      var uploadBlobs = function (blobInfos, openNotification) {
+        blobInfos = Tools.grep(blobInfos, function (blobInfo) {
+          return !uploadStatus.isUploaded(blobInfo.blobUri());
+        });
+        return promiseObj.all(Tools.map(blobInfos, function (blobInfo) {
+          return uploadStatus.isPending(blobInfo.blobUri()) ? pendingUploadBlobInfo(blobInfo) : uploadBlobInfo(blobInfo, settings.handler, openNotification);
+        }));
       };
-    };
+      var upload = function (blobInfos, openNotification) {
+        return !settings.url && isDefaultHandler(settings.handler) ? noUpload() : uploadBlobs(blobInfos, openNotification);
+      };
+      if (isFunction(settings.handler) === false) {
+        settings.handler = defaultHandler;
+      }
+      return { upload: upload };
+    }
 
     function UploadStatus () {
       var PENDING = 1, UPLOADED = 2;
@@ -13443,6 +13355,106 @@
       };
     }
 
+    var count$1 = 0;
+    var seed = function () {
+      var rnd = function () {
+        return Math.round(Math.random() * 4294967295).toString(36);
+      };
+      var now = new Date().getTime();
+      return 's' + now.toString(36) + rnd() + rnd() + rnd();
+    };
+    var uuid = function (prefix) {
+      return prefix + count$1++ + seed();
+    };
+    var Uuid = { uuid: uuid };
+
+    var BlobCache = function () {
+      var cache = [];
+      var mimeToExt = function (mime) {
+        var mimes = {
+          'image/jpeg': 'jpg',
+          'image/jpg': 'jpg',
+          'image/gif': 'gif',
+          'image/png': 'png'
+        };
+        return mimes[mime.toLowerCase()] || 'dat';
+      };
+      var create = function (o, blob, base64, filename) {
+        if (isString(o)) {
+          var id = o;
+          return toBlobInfo({
+            id: id,
+            name: filename,
+            blob: blob,
+            base64: base64
+          });
+        } else if (isObject(o)) {
+          return toBlobInfo(o);
+        } else {
+          throw new Error('Unknown input type');
+        }
+      };
+      var toBlobInfo = function (o) {
+        var id, name;
+        if (!o.blob || !o.base64) {
+          throw new Error('blob and base64 representations of the image are required for BlobInfo to be created');
+        }
+        id = o.id || Uuid.uuid('blobid');
+        name = o.name || id;
+        return {
+          id: constant(id),
+          name: constant(name),
+          filename: constant(name + '.' + mimeToExt(o.blob.type)),
+          blob: constant(o.blob),
+          base64: constant(o.base64),
+          blobUri: constant(o.blobUri || domGlobals.URL.createObjectURL(o.blob)),
+          uri: constant(o.uri)
+        };
+      };
+      var add = function (blobInfo) {
+        if (!get(blobInfo.id())) {
+          cache.push(blobInfo);
+        }
+      };
+      var get = function (id) {
+        return findFirst(function (cachedBlobInfo) {
+          return cachedBlobInfo.id() === id;
+        });
+      };
+      var findFirst = function (predicate) {
+        return filter(cache, predicate)[0];
+      };
+      var getByUri = function (blobUri) {
+        return findFirst(function (blobInfo) {
+          return blobInfo.blobUri() === blobUri;
+        });
+      };
+      var removeByUri = function (blobUri) {
+        cache = filter(cache, function (blobInfo) {
+          if (blobInfo.blobUri() === blobUri) {
+            domGlobals.URL.revokeObjectURL(blobInfo.blobUri());
+            return false;
+          }
+          return true;
+        });
+      };
+      var destroy = function () {
+        each(cache, function (cachedBlobInfo) {
+          domGlobals.URL.revokeObjectURL(cachedBlobInfo.blobUri());
+        });
+        cache = [];
+      };
+      return {
+        create: create,
+        add: add,
+        get: get,
+        getByUri: getByUri,
+        findFirst: findFirst,
+        removeByUri: removeByUri,
+        destroy: destroy
+      };
+    };
+
     var EditorUpload = function (editor) {
       var blobCache = BlobCache();
       var uploader, imageScanner;
@@ -13512,8 +13524,7 @@
           });
         }
         return scanForImages().then(aliveGuard(function (imageInfos) {
-          var blobInfos;
-          blobInfos = map(imageInfos, function (imageInfo) {
+          var blobInfos = map(imageInfos, function (imageInfo) {
             return imageInfo.blobInfo;
           });
           return uploader.upload(blobInfos, openNotification).then(aliveGuard(function (result) {
@@ -24759,261 +24770,66 @@
     };
     var Render = { render: render };
 
-    var internalContentEditableAttr = 'data-mce-contenteditable';
-    var toggleClass = function (elm, cls, state) {
-      if (has$2(elm, cls) && state === false) {
-        remove$4(elm, cls);
-      } else if (state) {
-        add$3(elm, cls);
+    var hasOnlyOneChild$1 = function (node) {
+      return node.firstChild && node.firstChild === node.lastChild;
+    };
+    var isPaddingNode = function (node) {
+      return node.name === 'br' || node.value === '\xA0';
+    };
+    var isPaddedEmptyBlock = function (schema, node) {
+      var blockElements = schema.getBlockElements();
+      return blockElements[node.name] && hasOnlyOneChild$1(node) && isPaddingNode(node.firstChild);
+    };
+    var isEmptyFragmentElement = function (schema, node) {
+      var nonEmptyElements = schema.getNonEmptyElements();
+      return node && (node.isEmpty(nonEmptyElements) || isPaddedEmptyBlock(schema, node));
+    };
+    var isListFragment = function (schema, fragment) {
+      var firstChild = fragment.firstChild;
+      var lastChild = fragment.lastChild;
+      if (firstChild && firstChild.name === 'meta') {
+        firstChild = firstChild.next;
+      }
+      if (lastChild && lastChild.attr('id') === 'mce_marker') {
+        lastChild = lastChild.prev;
+      }
+      if (isEmptyFragmentElement(schema, lastChild)) {
+        lastChild = lastChild.prev;
+      }
+      if (!firstChild || firstChild !== lastChild) {
+        return false;
       }
+      return firstChild.name === 'ul' || firstChild.name === 'ol';
     };
-    var setEditorCommandState = function (editor, cmd, state) {
-      try {
-        editor.getDoc().execCommand(cmd, false, state);
-      } catch (ex) {
+    var cleanupDomFragment = function (domFragment) {
+      var firstChild = domFragment.firstChild;
+      var lastChild = domFragment.lastChild;
+      if (firstChild && firstChild.nodeName === 'META') {
+        firstChild.parentNode.removeChild(firstChild);
+      }
+      if (lastChild && lastChild.id === 'mce_marker') {
+        lastChild.parentNode.removeChild(lastChild);
       }
+      return domFragment;
     };
-    var setContentEditable = function (elm, state) {
-      elm.dom().contentEditable = state ? 'true' : 'false';
+    var toDomFragment = function (dom, serializer, fragment) {
+      var html = serializer.serialize(fragment);
+      var domFragment = dom.createFragment(html);
+      return cleanupDomFragment(domFragment);
     };
-    var switchOffContentEditableTrue = function (elm) {
-      each(descendants$1(elm, '*[contenteditable="true"]'), function (elm) {
-        set(elm, internalContentEditableAttr, 'true');
-        setContentEditable(elm, false);
+    var listItems$1 = function (elm) {
+      return Tools.grep(elm.childNodes, function (child) {
+        return child.nodeName === 'LI';
       });
     };
-    var switchOnContentEditableTrue = function (elm) {
-      each(descendants$1(elm, '*[' + internalContentEditableAttr + '="true"]'), function (elm) {
-        remove(elm, internalContentEditableAttr);
-        setContentEditable(elm, true);
-      });
+    var isPadding = function (node) {
+      return node.data === '\xA0' || NodeType.isBr(node);
     };
-    var removeFakeSelection = function (editor) {
-      Option.from(editor.selection.getNode()).each(function (elm) {
-        elm.removeAttribute('data-mce-selected');
-      });
+    var isListItemPadded = function (node) {
+      return node && node.firstChild && node.firstChild === node.lastChild && isPadding(node.firstChild);
     };
-    var restoreFakeSelection = function (editor) {
-      editor.selection.setRng(editor.selection.getRng());
-    };
-    var toggleReadOnly = function (editor, state) {
-      var body = Element.fromDom(editor.getBody());
-      toggleClass(body, 'mce-content-readonly', state);
-      if (state) {
-        editor.selection.controlSelection.hideResizeRect();
-        editor._selectionOverrides.hideFakeCaret();
-        removeFakeSelection(editor);
-        editor.readonly = true;
-        setContentEditable(body, false);
-        switchOffContentEditableTrue(body);
-      } else {
-        editor.readonly = false;
-        setContentEditable(body, true);
-        switchOnContentEditableTrue(body);
-        setEditorCommandState(editor, 'StyleWithCSS', false);
-        setEditorCommandState(editor, 'enableInlineTableEditing', false);
-        setEditorCommandState(editor, 'enableObjectResizing', false);
-        if (EditorFocus.hasEditorOrUiFocus(editor)) {
-          editor.focus();
-        }
-        restoreFakeSelection(editor);
-        editor.nodeChanged();
-      }
-    };
-    var isReadOnly = function (editor) {
-      return editor.readonly === true;
-    };
-    var registerFilters = function (editor) {
-      editor.parser.addAttributeFilter('contenteditable', function (nodes) {
-        if (isReadOnly(editor)) {
-          each(nodes, function (node) {
-            node.attr(internalContentEditableAttr, node.attr('contenteditable'));
-            node.attr('contenteditable', 'false');
-          });
-        }
-      });
-      editor.serializer.addAttributeFilter(internalContentEditableAttr, function (nodes) {
-        if (isReadOnly(editor)) {
-          each(nodes, function (node) {
-            node.attr('contenteditable', node.attr(internalContentEditableAttr));
-          });
-        }
-      });
-      editor.serializer.addTempAttr(internalContentEditableAttr);
-    };
-    var registerReadOnlyContentFilters = function (editor) {
-      if (editor.serializer) {
-        registerFilters(editor);
-      } else {
-        editor.on('PreInit', function () {
-          registerFilters(editor);
-        });
-      }
-    };
-    var isClickEvent = function (e) {
-      return e.type === 'click';
-    };
-    var preventReadOnlyEvents = function (e) {
-      var target = e.target;
-      if (isClickEvent(e) && target.tagName === 'A' && !VK.metaKeyPressed(e)) {
-        e.preventDefault();
-      }
-    };
-    var registerReadOnlySelectionBlockers = function (editor) {
-      editor.on('ShowCaret', function (e) {
-        if (isReadOnly(editor)) {
-          e.preventDefault();
-        }
-      });
-      editor.on('ObjectSelected', function (e) {
-        if (isReadOnly(editor)) {
-          e.preventDefault();
-        }
-      });
-    };
-
-    var defaultModes = [
-      'design',
-      'readonly'
-    ];
-    var switchToMode = function (editor, activeMode, availableModes, mode) {
-      var oldMode = availableModes[activeMode.get()];
-      var newMode = availableModes[mode];
-      try {
-        newMode.activate();
-      } catch (e) {
-        domGlobals.console.error('problem while activating editor mode ' + mode + ':', e);
-        return;
-      }
-      oldMode.deactivate();
-      if (oldMode.editorReadOnly !== newMode.editorReadOnly) {
-        toggleReadOnly(editor, newMode.editorReadOnly);
-      }
-      activeMode.set(mode);
-      Events.fireSwitchMode(editor, mode);
-    };
-    var setMode = function (editor, availableModes, activeMode, mode) {
-      if (mode === activeMode.get()) {
-        return;
-      } else if (!has(availableModes, mode)) {
-        throw new Error('Editor mode \'' + mode + '\' is invalid');
-      }
-      if (editor.initialized) {
-        switchToMode(editor, activeMode, availableModes, mode);
-      } else {
-        editor.on('init', function () {
-          return switchToMode(editor, activeMode, availableModes, mode);
-        });
-      }
-    };
-    var registerMode = function (availableModes, mode, api) {
-      var _a;
-      if (contains(defaultModes, mode)) {
-        throw new Error('Cannot override default mode ' + mode);
-      }
-      return __assign(__assign({}, availableModes), (_a = {}, _a[mode] = __assign(__assign({}, api), {
-        deactivate: function () {
-          try {
-            api.deactivate();
-          } catch (e) {
-            domGlobals.console.error('problem while deactivating editor mode ' + mode + ':', e);
-          }
-        }
-      }), _a));
-    };
-
-    var create$4 = function (editor) {
-      var activeMode = Cell('design');
-      var availableModes = Cell({
-        design: {
-          activate: noop,
-          deactivate: noop,
-          editorReadOnly: false
-        },
-        readonly: {
-          activate: noop,
-          deactivate: noop,
-          editorReadOnly: true
-        }
-      });
-      registerReadOnlyContentFilters(editor);
-      registerReadOnlySelectionBlockers(editor);
-      return {
-        isReadOnly: function () {
-          return isReadOnly(editor);
-        },
-        set: function (mode) {
-          return setMode(editor, availableModes.get(), activeMode, mode);
-        },
-        get: function () {
-          return activeMode.get();
-        },
-        register: function (mode, api) {
-          availableModes.set(registerMode(availableModes.get(), mode, api));
-        }
-      };
-    };
-
-    var hasOnlyOneChild$1 = function (node) {
-      return node.firstChild && node.firstChild === node.lastChild;
-    };
-    var isPaddingNode = function (node) {
-      return node.name === 'br' || node.value === '\xA0';
-    };
-    var isPaddedEmptyBlock = function (schema, node) {
-      var blockElements = schema.getBlockElements();
-      return blockElements[node.name] && hasOnlyOneChild$1(node) && isPaddingNode(node.firstChild);
-    };
-    var isEmptyFragmentElement = function (schema, node) {
-      var nonEmptyElements = schema.getNonEmptyElements();
-      return node && (node.isEmpty(nonEmptyElements) || isPaddedEmptyBlock(schema, node));
-    };
-    var isListFragment = function (schema, fragment) {
-      var firstChild = fragment.firstChild;
-      var lastChild = fragment.lastChild;
-      if (firstChild && firstChild.name === 'meta') {
-        firstChild = firstChild.next;
-      }
-      if (lastChild && lastChild.attr('id') === 'mce_marker') {
-        lastChild = lastChild.prev;
-      }
-      if (isEmptyFragmentElement(schema, lastChild)) {
-        lastChild = lastChild.prev;
-      }
-      if (!firstChild || firstChild !== lastChild) {
-        return false;
-      }
-      return firstChild.name === 'ul' || firstChild.name === 'ol';
-    };
-    var cleanupDomFragment = function (domFragment) {
-      var firstChild = domFragment.firstChild;
-      var lastChild = domFragment.lastChild;
-      if (firstChild && firstChild.nodeName === 'META') {
-        firstChild.parentNode.removeChild(firstChild);
-      }
-      if (lastChild && lastChild.id === 'mce_marker') {
-        lastChild.parentNode.removeChild(lastChild);
-      }
-      return domFragment;
-    };
-    var toDomFragment = function (dom, serializer, fragment) {
-      var html = serializer.serialize(fragment);
-      var domFragment = dom.createFragment(html);
-      return cleanupDomFragment(domFragment);
-    };
-    var listItems$1 = function (elm) {
-      return Tools.grep(elm.childNodes, function (child) {
-        return child.nodeName === 'LI';
-      });
-    };
-    var isPadding = function (node) {
-      return node.data === '\xA0' || NodeType.isBr(node);
-    };
-    var isListItemPadded = function (node) {
-      return node && node.firstChild && node.firstChild === node.lastChild && isPadding(node.firstChild);
-    };
-    var isEmptyOrPadded = function (elm) {
-      return !elm.firstChild || isListItemPadded(elm);
+    var isEmptyOrPadded = function (elm) {
+      return !elm.firstChild || isListItemPadded(elm);
     };
     var trimListItems = function (elms) {
       return elms.length > 0 && isEmptyOrPadded(elms[elms.length - 1]) ? elms.slice(0, -1) : elms;
@@ -25447,16 +25263,50 @@
       forwardDeleteCommand: forwardDeleteCommand
     };
 
+    var ancestor$3 = function (scope, transform, isRoot) {
+      var element = scope.dom();
+      var stop = isFunction(isRoot) ? isRoot : constant(false);
+      while (element.parentNode) {
+        element = element.parentNode;
+        var el = Element.fromDom(element);
+        var transformed = transform(el);
+        if (transformed.isSome()) {
+          return transformed;
+        } else if (stop(el)) {
+          break;
+        }
+      }
+      return Option.none();
+    };
+    var closest$2 = function (scope, transform, isRoot) {
+      var current = transform(scope);
+      return current.orThunk(function () {
+        return isRoot(scope) ? Option.none() : ancestor$3(scope, transform, isRoot);
+      });
+    };
+
+    var legacyPropNames = {
+      'font-size': 'size',
+      'font-family': 'face'
+    };
     var getSpecifiedFontProp = function (propName, rootElm, elm) {
       var getProperty = function (elm) {
-        return getRaw(elm, propName);
+        return getRaw(elm, propName).orThunk(function () {
+          if (name(elm) === 'font') {
+            return get(legacyPropNames, propName).bind(function (legacyPropName) {
+              return getOpt(elm, legacyPropName);
+            });
+          } else {
+            return Option.none();
+          }
+        });
       };
       var isRoot = function (elm) {
         return eq(Element.fromDom(rootElm), elm);
       };
-      return closest(Element.fromDom(elm), function (elm) {
-        return getProperty(elm).isSome();
-      }, isRoot).bind(getProperty);
+      return closest$2(Element.fromDom(elm), function (elm) {
+        return getProperty(elm);
+      }, isRoot);
     };
     var round$1 = function (number, precision) {
       var factor = Math.pow(10, precision);
@@ -26137,22 +25987,138 @@
       }
     };
 
-    var DOM$7 = DOMUtils$1.DOM;
-    var customEventRootDelegates;
-    var getEventTarget = function (editor, eventName) {
-      if (eventName === 'selectionchange') {
-        return editor.getDoc();
-      }
-      if (!editor.inline && /^mouse|touch|click|contextmenu|drop|dragover|dragend/.test(eventName)) {
-        return editor.getDoc().documentElement;
-      }
-      if (editor.settings.event_root) {
-        if (!editor.eventRoot) {
-          editor.eventRoot = DOM$7.select(editor.settings.event_root)[0];
-        }
-        return editor.eventRoot;
+    var internalContentEditableAttr = 'data-mce-contenteditable';
+    var toggleClass = function (elm, cls, state) {
+      if (has$2(elm, cls) && state === false) {
+        remove$4(elm, cls);
+      } else if (state) {
+        add$3(elm, cls);
       }
-      return editor.getBody();
+    };
+    var setEditorCommandState = function (editor, cmd, state) {
+      try {
+        editor.getDoc().execCommand(cmd, false, state);
+      } catch (ex) {
+      }
+    };
+    var setContentEditable = function (elm, state) {
+      elm.dom().contentEditable = state ? 'true' : 'false';
+    };
+    var switchOffContentEditableTrue = function (elm) {
+      each(descendants$1(elm, '*[contenteditable="true"]'), function (elm) {
+        set(elm, internalContentEditableAttr, 'true');
+        setContentEditable(elm, false);
+      });
+    };
+    var switchOnContentEditableTrue = function (elm) {
+      each(descendants$1(elm, '*[' + internalContentEditableAttr + '="true"]'), function (elm) {
+        remove(elm, internalContentEditableAttr);
+        setContentEditable(elm, true);
+      });
+    };
+    var removeFakeSelection = function (editor) {
+      Option.from(editor.selection.getNode()).each(function (elm) {
+        elm.removeAttribute('data-mce-selected');
+      });
+    };
+    var restoreFakeSelection = function (editor) {
+      editor.selection.setRng(editor.selection.getRng());
+    };
+    var toggleReadOnly = function (editor, state) {
+      var body = Element.fromDom(editor.getBody());
+      toggleClass(body, 'mce-content-readonly', state);
+      if (state) {
+        editor.selection.controlSelection.hideResizeRect();
+        editor._selectionOverrides.hideFakeCaret();
+        removeFakeSelection(editor);
+        editor.readonly = true;
+        setContentEditable(body, false);
+        switchOffContentEditableTrue(body);
+      } else {
+        editor.readonly = false;
+        setContentEditable(body, true);
+        switchOnContentEditableTrue(body);
+        setEditorCommandState(editor, 'StyleWithCSS', false);
+        setEditorCommandState(editor, 'enableInlineTableEditing', false);
+        setEditorCommandState(editor, 'enableObjectResizing', false);
+        if (EditorFocus.hasEditorOrUiFocus(editor)) {
+          editor.focus();
+        }
+        restoreFakeSelection(editor);
+        editor.nodeChanged();
+      }
+    };
+    var isReadOnly = function (editor) {
+      return editor.readonly === true;
+    };
+    var registerFilters = function (editor) {
+      editor.parser.addAttributeFilter('contenteditable', function (nodes) {
+        if (isReadOnly(editor)) {
+          each(nodes, function (node) {
+            node.attr(internalContentEditableAttr, node.attr('contenteditable'));
+            node.attr('contenteditable', 'false');
+          });
+        }
+      });
+      editor.serializer.addAttributeFilter(internalContentEditableAttr, function (nodes) {
+        if (isReadOnly(editor)) {
+          each(nodes, function (node) {
+            node.attr('contenteditable', node.attr(internalContentEditableAttr));
+          });
+        }
+      });
+      editor.serializer.addTempAttr(internalContentEditableAttr);
+    };
+    var registerReadOnlyContentFilters = function (editor) {
+      if (editor.serializer) {
+        registerFilters(editor);
+      } else {
+        editor.on('PreInit', function () {
+          registerFilters(editor);
+        });
+      }
+    };
+    var isClickEvent = function (e) {
+      return e.type === 'click';
+    };
+    var isInAnchor = function (editor, target) {
+      return editor.dom.getParent(target, 'a') !== null;
+    };
+    var preventReadOnlyEvents = function (editor, e) {
+      var target = e.target;
+      if (isClickEvent(e) && !VK.metaKeyPressed(e) && isInAnchor(editor, target)) {
+        e.preventDefault();
+      }
+    };
+    var registerReadOnlySelectionBlockers = function (editor) {
+      editor.on('ShowCaret', function (e) {
+        if (isReadOnly(editor)) {
+          e.preventDefault();
+        }
+      });
+      editor.on('ObjectSelected', function (e) {
+        if (isReadOnly(editor)) {
+          e.preventDefault();
+        }
+      });
+    };
+
+    var DOM$7 = DOMUtils$1.DOM;
+    var customEventRootDelegates;
+    var getEventTarget = function (editor, eventName) {
+      if (eventName === 'selectionchange') {
+        return editor.getDoc();
+      }
+      if (!editor.inline && /^mouse|touch|click|contextmenu|drop|dragover|dragend/.test(eventName)) {
+        return editor.getDoc().documentElement;
+      }
+      if (editor.settings.event_root) {
+        if (!editor.eventRoot) {
+          editor.eventRoot = DOM$7.select(editor.settings.event_root)[0];
+        }
+        return editor.eventRoot;
+      }
+      return editor.getBody();
     };
     var isListening = function (editor) {
       return !editor.hidden && !isReadOnly(editor);
@@ -26161,7 +26127,7 @@
       if (isListening(editor)) {
         editor.fire(eventName, e);
       } else if (isReadOnly(editor)) {
-        preventReadOnlyEvents(e);
+        preventReadOnlyEvents(editor, e);
       }
     };
     var bindEventDelegate = function (editor, eventName) {
@@ -26262,6 +26228,88 @@
       }
     });
 
+    var defaultModes = [
+      'design',
+      'readonly'
+    ];
+    var switchToMode = function (editor, activeMode, availableModes, mode) {
+      var oldMode = availableModes[activeMode.get()];
+      var newMode = availableModes[mode];
+      try {
+        newMode.activate();
+      } catch (e) {
+        domGlobals.console.error('problem while activating editor mode ' + mode + ':', e);
+        return;
+      }
+      oldMode.deactivate();
+      if (oldMode.editorReadOnly !== newMode.editorReadOnly) {
+        toggleReadOnly(editor, newMode.editorReadOnly);
+      }
+      activeMode.set(mode);
+      Events.fireSwitchMode(editor, mode);
+    };
+    var setMode = function (editor, availableModes, activeMode, mode) {
+      if (mode === activeMode.get()) {
+        return;
+      } else if (!has(availableModes, mode)) {
+        throw new Error('Editor mode \'' + mode + '\' is invalid');
+      }
+      if (editor.initialized) {
+        switchToMode(editor, activeMode, availableModes, mode);
+      } else {
+        editor.on('init', function () {
+          return switchToMode(editor, activeMode, availableModes, mode);
+        });
+      }
+    };
+    var registerMode = function (availableModes, mode, api) {
+      var _a;
+      if (contains(defaultModes, mode)) {
+        throw new Error('Cannot override default mode ' + mode);
+      }
+      return __assign(__assign({}, availableModes), (_a = {}, _a[mode] = __assign(__assign({}, api), {
+        deactivate: function () {
+          try {
+            api.deactivate();
+          } catch (e) {
+            domGlobals.console.error('problem while deactivating editor mode ' + mode + ':', e);
+          }
+        }
+      }), _a));
+    };
+
+    var create$4 = function (editor) {
+      var activeMode = Cell('design');
+      var availableModes = Cell({
+        design: {
+          activate: noop,
+          deactivate: noop,
+          editorReadOnly: false
+        },
+        readonly: {
+          activate: noop,
+          deactivate: noop,
+          editorReadOnly: true
+        }
+      });
+      registerReadOnlyContentFilters(editor);
+      registerReadOnlySelectionBlockers(editor);
+      return {
+        isReadOnly: function () {
+          return isReadOnly(editor);
+        },
+        set: function (mode) {
+          return setMode(editor, availableModes.get(), activeMode, mode);
+        },
+        get: function () {
+          return activeMode.get();
+        },
+        register: function (mode, api) {
+          availableModes.set(registerMode(availableModes.get(), mode, api));
+        }
+      };
+    };
+
     var each$h = Tools.each, explode$3 = Tools.explode;
     var keyCodeLookup = {
       f1: 112,
@@ -26415,6 +26463,70 @@
       return Shortcuts;
     }();
 
+    var create$5 = function () {
+      var buttons = {};
+      var menuItems = {};
+      var popups = {};
+      var icons = {};
+      var contextMenus = {};
+      var contextToolbars = {};
+      var sidebars = {};
+      var add = function (collection, type) {
+        return function (name, spec) {
+          return collection[name.toLowerCase()] = __assign(__assign({}, spec), { type: type });
+        };
+      };
+      var addIcon = function (name, svgData) {
+        return icons[name.toLowerCase()] = svgData;
+      };
+      return {
+        addButton: add(buttons, 'button'),
+        addToggleButton: add(buttons, 'togglebutton'),
+        addMenuButton: add(buttons, 'menubutton'),
+        addSplitButton: add(buttons, 'splitbutton'),
+        addMenuItem: add(menuItems, 'menuitem'),
+        addNestedMenuItem: add(menuItems, 'nestedmenuitem'),
+        addToggleMenuItem: add(menuItems, 'togglemenuitem'),
+        addAutocompleter: add(popups, 'autocompleter'),
+        addContextMenu: add(contextMenus, 'contextmenu'),
+        addContextToolbar: add(contextToolbars, 'contexttoolbar'),
+        addContextForm: add(contextToolbars, 'contextform'),
+        addSidebar: add(sidebars, 'sidebar'),
+        addIcon: addIcon,
+        getAll: function () {
+          return {
+            buttons: buttons,
+            menuItems: menuItems,
+            icons: icons,
+            popups: popups,
+            contextMenus: contextMenus,
+            contextToolbars: contextToolbars,
+            sidebars: sidebars
+          };
+        }
+      };
+    };
+
+    var registry = function () {
+      var bridge = create$5();
+      return {
+        addAutocompleter: bridge.addAutocompleter,
+        addButton: bridge.addButton,
+        addContextForm: bridge.addContextForm,
+        addContextMenu: bridge.addContextMenu,
+        addContextToolbar: bridge.addContextToolbar,
+        addIcon: bridge.addIcon,
+        addMenuButton: bridge.addMenuButton,
+        addMenuItem: bridge.addMenuItem,
+        addNestedMenuItem: bridge.addNestedMenuItem,
+        addSidebar: bridge.addSidebar,
+        addSplitButton: bridge.addSplitButton,
+        addToggleButton: bridge.addToggleButton,
+        addToggleMenuItem: bridge.addToggleMenuItem,
+        getAll: bridge.getAll
+      };
+    };
+
     var each$i = Tools.each, trim$4 = Tools.trim;
     var queryParts = 'source protocol authority userInfo user password host port relative path directory file query anchor'.split(' ');
     var DEFAULT_PORTS = {
@@ -26660,70 +26772,6 @@
       return URI;
     }();
 
-    var create$5 = function () {
-      var buttons = {};
-      var menuItems = {};
-      var popups = {};
-      var icons = {};
-      var contextMenus = {};
-      var contextToolbars = {};
-      var sidebars = {};
-      var add = function (collection, type) {
-        return function (name, spec) {
-          return collection[name.toLowerCase()] = __assign(__assign({}, spec), { type: type });
-        };
-      };
-      var addIcon = function (name, svgData) {
-        return icons[name.toLowerCase()] = svgData;
-      };
-      return {
-        addButton: add(buttons, 'button'),
-        addToggleButton: add(buttons, 'togglebutton'),
-        addMenuButton: add(buttons, 'menubutton'),
-        addSplitButton: add(buttons, 'splitbutton'),
-        addMenuItem: add(menuItems, 'menuitem'),
-        addNestedMenuItem: add(menuItems, 'nestedmenuitem'),
-        addToggleMenuItem: add(menuItems, 'togglemenuitem'),
-        addAutocompleter: add(popups, 'autocompleter'),
-        addContextMenu: add(contextMenus, 'contextmenu'),
-        addContextToolbar: add(contextToolbars, 'contexttoolbar'),
-        addContextForm: add(contextToolbars, 'contextform'),
-        addSidebar: add(sidebars, 'sidebar'),
-        addIcon: addIcon,
-        getAll: function () {
-          return {
-            buttons: buttons,
-            menuItems: menuItems,
-            icons: icons,
-            popups: popups,
-            contextMenus: contextMenus,
-            contextToolbars: contextToolbars,
-            sidebars: sidebars
-          };
-        }
-      };
-    };
-
-    var registry = function () {
-      var bridge = create$5();
-      return {
-        addAutocompleter: bridge.addAutocompleter,
-        addButton: bridge.addButton,
-        addContextForm: bridge.addContextForm,
-        addContextMenu: bridge.addContextMenu,
-        addContextToolbar: bridge.addContextToolbar,
-        addIcon: bridge.addIcon,
-        addMenuButton: bridge.addMenuButton,
-        addMenuItem: bridge.addMenuItem,
-        addNestedMenuItem: bridge.addNestedMenuItem,
-        addSidebar: bridge.addSidebar,
-        addSplitButton: bridge.addSplitButton,
-        addToggleButton: bridge.addToggleButton,
-        addToggleMenuItem: bridge.addToggleMenuItem,
-        getAll: bridge.getAll
-      };
-    };
-
     var DOM$8 = DOMUtils$1.DOM;
     var extend$3 = Tools.extend, each$j = Tools.each;
     var resolve$3 = Tools.resolve;
@@ -27171,8 +27219,8 @@
       suffix: null,
       $: DomQuery,
       majorVersion: '5',
-      minorVersion: '1.5',
-      releaseDate: '2019-12-19',
+      minorVersion: '1.6',
+      releaseDate: '2020-01-28',
       editors: legacyEditors,
       i18n: I18n,
       activeEditor: null,