@syncfusion/ej2-richtexteditor 20.3.59 → 20.3.60

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.3.59
+*  version : 20.3.60
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-richtexteditor@*",
-  "_id": "@syncfusion/ej2-richtexteditor@20.3.56",
+  "_id": "@syncfusion/ej2-richtexteditor@20.3.59",
   "_inBundle": false,
-  "_integrity": "sha512-GX0LVZvQQDLl5IjbQCCiHxI1SsLtTTKpOq3j8e4Xgs/7SPn/ZVNWdV9K1wLcHer8DFruuZMW/4vsw0bDDn2mBg==",
+  "_integrity": "sha512-TxF/ECZhds8pq49/ggBENGJuYB3bGc4DC43VwXGmWgaCqogtn/wCaabpcF8x6vhN2ouMHAbq3+pc4A9W43FVvg==",
   "_location": "/@syncfusion/ej2-richtexteditor",
   "_phantomChildren": {},
   "_requested": {
@@ -26,8 +26,8 @@
     "/@syncfusion/ej2-react-richtexteditor",
     "/@syncfusion/ej2-vue-richtexteditor"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-20.3.56.tgz",
-  "_shasum": "95846fbcc0d3e51f0339f71e72c675b64323b020",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-20.3.59.tgz",
+  "_shasum": "8e872a7a20955614b65b0b804d4fce1b98a69984",
   "_spec": "@syncfusion/ej2-richtexteditor@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -42,8 +42,8 @@
     "@syncfusion/ej2-buttons": "~20.3.58",
     "@syncfusion/ej2-filemanager": "~20.3.56",
     "@syncfusion/ej2-inputs": "~20.3.57",
-    "@syncfusion/ej2-navigations": "~20.3.58",
-    "@syncfusion/ej2-popups": "~20.3.59",
+    "@syncfusion/ej2-navigations": "~20.3.60",
+    "@syncfusion/ej2-popups": "~20.3.60",
     "@syncfusion/ej2-splitbuttons": "~20.3.56"
   },
   "deprecated": false,
@@ -70,6 +70,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "20.3.59",
+  "version": "20.3.60",
   "sideEffects": false
 }

package/src/editor-manager/plugin/inserthtml.js

@@ -392,7 +392,8 @@ var InsertHtml = /** @class */ (function () {
                     }
                 }
                 else if (currentNode.nodeName === '#text' && !isNOU(currentNode.parentElement) &&
-                    currentNode.parentElement.nodeName === 'LI' && currentNode.parentElement.textContent.trim().length > 0) {
+                    (currentNode.parentElement.nodeName === 'LI' || (blockNode === editNode && currentNode.parentElement === blockNode)) &&
+                    currentNode.parentElement.textContent.trim().length > 0) {
                     splitedElm = currentNode;
                     if (currentNode.parentElement.nodeName === 'LI' && !isNOU(currentNode.nextSibling) &&
                         currentNode.nextSibling.nodeName === 'BR') {

package/src/editor-manager/plugin/ms-word-clean-up.js

@@ -241,7 +241,9 @@ var MsWordPaste = /** @class */ (function () {
         for (var i = 0; i < allElements.length; i++) {
             if (allElements[i].children.length === 0 && allElements[i].innerHTML === '&nbsp;' &&
                 (allElements[i].innerHTML === '&nbsp;' && !allElements[i].closest('li')) &&
-                !allElements[i].closest('td')) {
+                !allElements[i].closest('td') && (allElements[i].nodeName !== 'SPAN' ||
+                allElements[i].nodeName === 'SPAN' && (isNOU(allElements[i].previousElementSibling) &&
+                    isNOU(allElements[i].nextElementSibling)))) {
                 var detachableElement = this.findDetachElem(allElements[i]);
                 var brElement = createElement('br');
                 if (!isNOU(detachableElement.parentElement)) {

package/src/editor-manager/plugin/selection-commands.js

@@ -93,6 +93,15 @@ var SelectionCommands = /** @class */ (function () {
                         isSubSup = formatNode === null ? false : true;
                     }
                 }
+                else if (formatNode.textContent !== nodes[index].textContent && formatNode.nodeName === 'SPAN' && formatNode.style[0] === 'font-size') {
+                    var currentParentElem = nodes[index].parentElement.textContent !== nodes[index].textContent ? nodes[index] : nodes[index].parentElement;
+                    var isSameTextContent = true;
+                    while (currentParentElem.textContent !== nodes[index].textContent && nodes[index].style[0] !== format && currentParentElem.nodeName === 'SPAN') {
+                        isSameTextContent = currentParentElem.textContent === currentParentElem.parentElement.textContent;
+                        currentParentElem = !isNOU(currentParentElem.parentElement) && isSameTextContent ? currentParentElem.parentElement : currentParentElem;
+                    }
+                    formatNode = currentParentElem;
+                }
                 if (index === 0 && formatNode === null) {
                     isFormat = true;
                 }
@@ -385,7 +394,33 @@ var SelectionCommands = /** @class */ (function () {
                                 liElement.style.textDecoration = 'inherit';
                             }
                         }
-                        nodes[index] = this.applyStyles(nodes, index, element);
+                        var enterType = isNOU(this.enterAction) ? 'P' : this.enterAction.toString();
+                        var currentNode = nodes[index];
+                        var isNestedNode = !isNOU(currentNode) && nodes[index].nodeName === '#text' && nodes[index].parentElement.nodeName !== enterType;
+                        var currentParentElem = currentNode.parentElement.textContent !== currentNode.textContent ? currentNode : currentNode.parentElement;
+                        if (isNestedNode) {
+                            var isSameTextContent = true;
+                            isNestedNode = false;
+                            while (!isNOU(currentParentElem) && isSameTextContent && currentParentElem.parentElement.nodeName !== enterType
+                                && (currentParentElem.nodeName === 'SPAN' && (currentParentElem.style.textDecoration === 'line-through' || 'underline')
+                                    || currentParentElem.nodeName === 'SPAN' && (currentParentElem.style[0] === 'background-color' || 'font-family' || 'color')
+                                    || (currentParentElem.nodeName === 'EM' || 'STRONG' || 'SUB' || 'SUP'))) {
+                                isSameTextContent = currentParentElem.textContent === currentParentElem.parentElement.textContent;
+                                currentParentElem = !isNOU(currentParentElem.parentElement) && isSameTextContent ? currentParentElem.parentElement : currentParentElem;
+                            }
+                            if (!isNOU(currentParentElem) && currentParentElem.childNodes.length > 0) {
+                                var nodeList = currentParentElem.querySelectorAll('span,strong,em,sub,sup');
+                                isNestedNode = nodeList.length > 0 && isSameTextContent;
+                            }
+                        }
+                        if (isNestedNode) {
+                            var nodeList = [];
+                            nodeList[0] = currentParentElem;
+                            this.applyStyles(nodeList, index, element);
+                        }
+                        else {
+                            nodes[index] = this.applyStyles(nodes, index, element);
+                        }
                         if (format === 'fontsize') {
                             var bg = closest(nodes[index].parentElement, 'span[style*=' + 'background-color' + ']');
                             if (!isNOU(bg)) {

package/src/rich-text-editor/actions/enter-key.js

@@ -171,7 +171,8 @@ var EnterKeyAction = /** @class */ (function () {
                                     }
                                     else {
                                         if ((nearBlockNode.textContent.trim().length !== 0 ||
-                                            nearBlockNode.childNodes[0].nodeName === 'IMG')) {
+                                            nearBlockNode.childNodes[0].nodeName === 'IMG' ||
+                                            (nearBlockNode.textContent.trim() === '' && nearBlockNode.querySelectorAll('img').length > 0))) {
                                             if ((_this.range.startOffset === _this.range.endOffset && _this.range.startOffset != 0)) {
                                                 newElem = _this.parent.formatter.editorManager.nodeCutter.SplitNode(_this.range, nearBlockNode, false).cloneNode(true);
                                             }

package/src/rich-text-editor/models/items.js

@@ -576,8 +576,8 @@ export var videoAlignItems = [
     { iconCss: 'e-icons e-justify-right', command: 'Videos', subCommand: 'JustifyRight' },
 ];
 var displayLocale = [
-    { locale: 'imageLayoutOptionDropDownInline', value: 'Inline' },
-    { locale: 'imageLayoutOptionDropDownBreak', value: 'Break' }
+    { locale: 'imageDisplayDropDownInline', value: 'Inline' },
+    { locale: 'imageDisplayDropDownBreak', value: 'Break' }
 ];
 var audioLayoutOptionLocale = [
     { locale: 'audioLayoutOptionDropDownInline', value: 'Inline' },

package/tslint.json

@@ -0,0 +1,111 @@
+{
+  "rules": {
+    "chai-vague-errors": true,
+    "use-isnan": true,
+    "missing-jsdoc": true,
+    "missing-optional-annotation": true,
+    "no-backbone-get-set-outside-model": true,
+    "no-banned-terms": true,
+    "no-constant-condition": true,
+    "no-control-regex": true,
+    "no-cookies": true,
+    "no-delete-expression": true,
+    "no-document-write": true,
+    "no-document-domain": true,
+    "no-disable-auto-sanitization": true,
+    "no-duplicate-case": true,
+    "no-duplicate-parameter-names": true,
+    "no-empty-interfaces": true,
+    "no-exec-script": true,
+    "no-function-constructor-with-string-args": true,
+    "no-function-expression": true,
+    "no-invalid-regexp": true,
+    "no-for-in": true,
+    "member-access": true,
+    "no-multiline-string": true,
+    "no-multiple-var-decl": true,
+    "no-unnecessary-bind": true,
+    "no-unnecessary-semicolons": true,
+    "no-octal-literal": true,
+    "no-regex-spaces": true,
+    "no-sparse-arrays": true,
+    "no-string-based-set-immediate": true,
+    "no-string-based-set-interval": true,
+    "no-unused-imports": true,
+    "no-with-statement": true,
+    "prefer-array-literal": true,
+    "promise-must-complete": false,
+    "react-no-dangerous-html": true,
+    "use-named-parameter": true,
+    "valid-typeof": true,
+    "max-func-body-length": [true, 100, {
+      "ignore-parameters-to-function-regex": "describe"
+    }],
+    "class-name": true,
+    "curly": true,
+    "eofline": false,
+    "forin": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "label-position": true,       
+    "max-line-length": [true, 140],
+    "no-arg": true,
+    "no-console": [true,
+      "debug",
+      "info",
+      "log",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-parameter-properties": true,
+    "no-debugger": true,    
+    "no-duplicate-variable": true,
+    "no-empty": true,
+    "no-eval": true,
+    "no-string-literal": true,
+    "no-switch-case-fall-through": true,
+    "trailing-comma": true,
+    "no-trailing-whitespace": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": false,
+    "no-var-requires": true,
+    "one-line": [true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "no-any": true,
+    "no-conditional-assignment": true,
+    "no-angle-bracket-type-assertion": false,
+    "align": [true, "parameters", "arguments", "statements"],
+    "no-empty-line-after-opening-brace": false,
+    "typedef-whitespace": [false],
+    "ban": true,
+    "quotemark": [true, "single"],
+    "semicolon": true,
+    "triple-equals": [true, "allow-null-check"],
+    "typedef": [true,
+      "call-signature",
+      "parameter",
+      "property-declaration",
+      "variable-declaration",
+      "arrow-parameter",
+      "member-variable-declaration"],    
+    "variable-name": true,
+    "whitespace": [true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ],
+    "jsdoc-format": true,
+    "no-var-keyword": true,
+    "radix": true
+  }
+}