@sapui5/sap.ui.richtexteditor 1.96.41 → 1.96.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.richtexteditor",
-  "version": "1.96.41",
+  "version": "1.96.43",
   "description": "SAPUI5 Library sap.ui.richtexteditor",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/richtexteditor/.library

@@ -5,7 +5,7 @@
 	<vendor>SAP SE</vendor>
 	<copyright>SAPUI5
  * (c) Copyright 2009-2021 SAP SE. All rights reserved.</copyright>
-	<version>1.96.41</version>
+	<version>1.96.43</version>
 
 	<documentation>A rich text editor (RTE) control. Requires installation of an additional rich text editor library.</documentation>
 

package/src/sap/ui/richtexteditor/RTESplitButton.js

@@ -24,7 +24,7 @@ sap.ui.define([
 		 * @alias sap.ui.richtexteditor.RTESplitButton
 		 *
 		 * @author SAP SE
-		 * @version 1.96.41
+		 * @version 1.96.43
 		 */
 		var RTESplitButton = SplitButton.extend("sap.ui.richtexteditor.RTESplitButton", {
 			metadata: {

package/src/sap/ui/richtexteditor/RichTextEditor.js

@@ -204,8 +204,7 @@ sap.ui.define([
 				 * <li>Usage of internal TinyMCE APIs is not recommended, since it might lead to issues upon TinyMCE version update.</li>
 				 * <li>TinyMCE version 3 and 4 are no longer supported and cannot be used.</li>
 				 * <li>TinyMCE 4 is out of support and by using it, application developers are accepting all the risks comming from that fact. In addition TinyMCE 4 will be removed in future releases.</li>
-				 * <li>TinyMCE 5 will be removed in future releases.</li>
-				 * <li>Have in mind when choosing a specific TinyMCE version that there might be differences in the support rules compared to UI5, therefore we might be forced to remove any TinyMCE version.</li>
+				 * <li>TinyMCE 5 and TinyMCE 6 will be removed in future releases.</li>
 				 * </ul>
 				 */
 				editorType: { type: "string", group: "Misc", defaultValue: 'TinyMCE' },
@@ -306,7 +305,7 @@ sap.ui.define([
 				buttonGroups: {type: "object[]", group: "Behavior", defaultValue: [] },
 
 				/**
-				 * Determines whether a Fiori Toolbar is used instead of the TinyMCE default toolbar one. It is applied only when the EditorType is TinyMCE5 or TinyMCE6 and sap.m library is loaded.
+				 * Determines whether a Fiori Toolbar is used instead of the TinyMCE default toolbar one. It is applied only when the EditorType is TinyMCE6 or TinyMCE7 and sap.m library is loaded.
 				 * <b>Note:</b> The <code>customToolbar</code> property will have effect only on initial loading. Changing it during runtime will not affect the initially loaded toolbar.
 				 *
 				 * @since 1.48
@@ -396,9 +395,12 @@ sap.ui.define([
 	RichTextEditor.EDITORTYPE_TINYMCE5 = library.EditorType.TinyMCE5;
 	RichTextEditor.EDITORTYPE_TINYMCE6 = library.EditorType.TinyMCE6;
 
+	RichTextEditor.EDITORTYPE_TINYMCE7 = library.EditorType.TinyMCE7;
+
 	// default
 	RichTextEditor.EDITORTYPE_TINYMCE = library.EditorType.TinyMCE;
 
+
 	var EDITOR_LOCATION_MAPPING = {};
 
 	// default
@@ -407,6 +409,7 @@ sap.ui.define([
 	EDITOR_LOCATION_MAPPING[RichTextEditor.EDITORTYPE_TINYMCE4] = "js/tiny_mce4/tinymce.min.js";
 	EDITOR_LOCATION_MAPPING[RichTextEditor.EDITORTYPE_TINYMCE5] = "js/tiny_mce5/tinymce.min.js";
 	EDITOR_LOCATION_MAPPING[RichTextEditor.EDITORTYPE_TINYMCE6] = "js/tiny_mce6/tinymce.min.js";
+	EDITOR_LOCATION_MAPPING[RichTextEditor.EDITORTYPE_TINYMCE7] = "js/tiny_mce7/tinymce.min.js";
 
 	RichTextEditor.DEFAULT_PLUGINS_TINYMCE5 = [
 		"emoticons",
@@ -420,6 +423,7 @@ sap.ui.define([
 		"textpattern",
 		"powerpaste"
 	];
+
 	RichTextEditor.DEFAULT_PLUGINS_TINYMCE6 = [
 		"emoticons",
 		"directionality",
@@ -429,6 +433,15 @@ sap.ui.define([
 		"powerpaste"
 	];
 
+	RichTextEditor.DEFAULT_PLUGINS_TINYMCE7 = [
+		"emoticons",
+		"directionality",
+		"image",
+		"table",
+		"link",
+		"powerpaste"
+	];
+
 	// TinyMCE does not provide some of the regions/languages that our messagebundle has, therefore with this mapping, we are falling back to the ones provided
 	RichTextEditor.MAPPED_LANGUAGES_TINYMCE = {
 		"bg": "bg_BG",
@@ -569,7 +582,7 @@ sap.ui.define([
 		"vi": "VN"
 	};
 
-	RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE6 = {
+	RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE7 = {
 		"zh": "CN",
 		"fr": "FR",
 		"bn": "BD",
@@ -601,6 +614,7 @@ sap.ui.define([
 	oEditorMapping[RichTextEditor.EDITORTYPE_TINYMCE4] = RichTextEditor.EDITORTYPE_TINYMCE4;
 	oEditorMapping[RichTextEditor.EDITORTYPE_TINYMCE5] = RichTextEditor.EDITORTYPE_TINYMCE5;
 	oEditorMapping[RichTextEditor.EDITORTYPE_TINYMCE6] = RichTextEditor.EDITORTYPE_TINYMCE6;
+	oEditorMapping[RichTextEditor.EDITORTYPE_TINYMCE7] = RichTextEditor.EDITORTYPE_TINYMCE7;
 
 	/**
 	 * Creates and returns a promise to load the given location as script url. Only the first invocation needs the
@@ -1158,7 +1172,8 @@ sap.ui.define([
 			"TinyMCE": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE5),
 			"TinyMCE4": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE5),
 			"TinyMCE5": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE5),
-			"TinyMCE6": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE6)
+			"TinyMCE6": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE6),
+			"TinyMCE7": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE7)
 		};
 
 		this.setPlugins(mapping[this.getEditorType()]);
@@ -1167,7 +1182,8 @@ sap.ui.define([
 			"TinyMCE": ["fontfamily", "fontsize", "forecolor", "backcolor"],
 			"TinyMCE4": ["fontselect", "fontsizeselect", "forecolor", "backcolor"],
 			"TinyMCE5": ["fontselect", "fontsizeselect", "forecolor", "backcolor"],
-			"TinyMCE6": ["fontfamily", "fontsize", "forecolor", "backcolor"]
+			"TinyMCE6": ["fontfamily", "fontsize", "forecolor", "backcolor"],
+			"TinyMCE7": ["fontfamily", "fontsize", "forecolor", "backcolor"]
 		};
 
 		this.setButtonGroups([{
@@ -1266,9 +1282,14 @@ sap.ui.define([
 			}
 
 			if (oEditorMapping[sEditorType] === "TinyMCE4") {
-				Log.error("TinyMCE version 4 is used as editor. This version is no longer supported by TinyMCE and will be removed in future releases, therefore using it is at your own risk. Please consider upgrading to TinyMCE version 6.");
-			} else if (oEditorMapping[sEditorType] === "TinyMCE5") {
-				Log.warning("TinyMCE version 5 is used as editor type. TinyMCE 5 will be depreacated with the next stable release of SAPUI5.");
+				Log.error("TinyMCE version 4 is used as editor. This version is no longer supported by TinyMCE and will be removed in future releases, therefore using it is at your own risk. Please consider upgrading to TinyMCE version 7.");
+			}
+			if (oEditorMapping[sEditorType] === "TinyMCE5") {
+				Log.error("TinyMCE version 5 is used as editor type. TinyMCE 5 is deprecated and will be removed from the code entirely in near future.");
+			}
+
+			if (oEditorMapping[sEditorType] === "TinyMCE6") {
+				Log.warning("TinyMCE version 6 is used as editor type. TinyMCE 6 will be deprecated and removed from the code entirely in near future.");
 			}
 
 			this.initTinyMCE();
@@ -1318,7 +1339,7 @@ sap.ui.define([
 			sGroupSep = sButtonSeparator + sGroupSeparator + sButtonSeparator,
 			i, iLen, mGroup,
 			aOrderedGroups = {},
-			bIsTinyMCE5Or6 = [RichTextEditor.EDITORTYPE_TINYMCE5, RichTextEditor.EDITORTYPE_TINYMCE6].includes(this.getEditorType()),
+			bIsTinyMCE4 = RichTextEditor.EDITORTYPE_TINYMCE4 === this.getEditorType() || RichTextEditor.EDITORTYPE_TINYMCE === this.getEditorType(),
 			sButtonRows = "",
 			aButtonRows = [];
 
@@ -1346,7 +1367,7 @@ sap.ui.define([
 					continue;
 				}
 
-				if (bIsTinyMCE5Or6) {
+				if (!bIsTinyMCE4) {
 					if (!sButtonRows) {
 						sButtonRows = "";
 					}
@@ -1360,7 +1381,7 @@ sap.ui.define([
 			}
 		}
 
-		if (bIsTinyMCE5Or6) {
+		if (!bIsTinyMCE4) {
 			return sButtonRows;
 		}
 
@@ -1516,6 +1537,8 @@ sap.ui.define([
 				return window.tinymce.majorVersion != "5";
 			case RichTextEditor.EDITORTYPE_TINYMCE6:
 				return window.tinymce.majorVersion != "6";
+			case RichTextEditor.EDITORTYPE_TINYMCE7:
+				return window.tinymce.majorVersion != "7";
 			default:
 				return false;
 		}
@@ -1904,17 +1927,17 @@ sap.ui.define([
 			sPluginsList = sPluginsList.replace(/(,powerpaste|powerpaste,)/gi, "");
 		}
 
-		var bIsTinyMCE5Or6 = [RichTextEditor.EDITORTYPE_TINYMCE5, RichTextEditor.EDITORTYPE_TINYMCE6].includes(this.getEditorType());
-		var bIsTinyMCE6 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6;
+		var bIsTinyMCE6or7 = [RichTextEditor.EDITORTYPE_TINYMCE6, RichTextEditor.EDITORTYPE_TINYMCE7].includes(this.getEditorType());
+		var bIsTinyMCE4 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE4 || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE;
 
 		// since TinyMCE 6 plugins property format has changed
-		if (bIsTinyMCE6) {
+		if (bIsTinyMCE6or7) {
 			sPluginsList = this.getPlugins().map(function(oPlugin) {
 				return oPlugin.name;
 			});
 		}
 
-		if (bIsTinyMCE6 && !this.getEditable()) {
+		if (bIsTinyMCE6or7 && !this.getEditable()) {
 			sPluginsList = sPluginsList.filter(function(oPlugin) {
 				return oPlugin !== "powerpaste";
 			});
@@ -1926,7 +1949,7 @@ sap.ui.define([
 			height: "calc(100% - var(--_sap_ui_richtexteditor__toolbar_height))",
 			directionality: this._getTextDirection(),
 			selector: "[id='" + this._textAreaId + "']",
-			theme: bIsTinyMCE5Or6 ? "silver" : "modern",
+			theme: bIsTinyMCE4 ? "modern" : "silver",
 			menubar: false,
 			language: this._getLanguageTinyMCE(),
 			browser_spellcheck: true,
@@ -1941,6 +1964,9 @@ sap.ui.define([
 			image_advtab: true, // Adds an "Advanced" tab to the image dialog allowing you to add custom styles, spacing and borders to images
 			readonly: !this.getEditable(),
 			nowrap: !this.getWrapping(),
+			license_key: "T7LKB99051C4AEADDA204B3B44B3D9C90B2B3708FB1F49DD4C4E3DC5836A51C4",
+			convert_unsafe_embeds: true, // default for v.7, remove after upgrade
+			sandbox_iframes: true, // default for v.7, remove after upgrade
 			init_instance_callback: function(oEditor) {
 				this._oEditor = oEditor;
 				fnOnInit();
@@ -1979,8 +2005,8 @@ sap.ui.define([
 		var oLocale = new Locale(Core.getConfiguration().getLanguage()),
 			sLanguage = oLocale.getLanguage(),
 			sRegion = oLocale.getRegion(),
-			bIsTinyMCE5Or6 = [RichTextEditor.EDITORTYPE_TINYMCE5, RichTextEditor.EDITORTYPE_TINYMCE6].includes(this.getEditorType()),
-			bIsTinyMCE6 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6,
+			bIsTinyMCE6or7 = [RichTextEditor.EDITORTYPE_TINYMCE6, RichTextEditor.EDITORTYPE_TINYMCE7].includes(this.getEditorType()),
+			bIsTinyMCE4 = RichTextEditor.EDITORTYPE_TINYMCE4 === this.getEditorType() || RichTextEditor.EDITORTYPE_TINYMCE === this.getEditorType(),
 			sLangStr;
 
 		// Language mapping for old/fallback languages
@@ -1988,7 +2014,7 @@ sap.ui.define([
 
 		// Find default region, if region is not given
 		if (!sRegion) {
-			sRegion = bIsTinyMCE6 ?  RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE6[sLanguage] : RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS[sLanguage];
+			sRegion = bIsTinyMCE6or7 ? RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE7[sLanguage] : RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS[sLanguage];
 		}
 
 		sLangStr = sRegion ? sLanguage + "_" + sRegion.toUpperCase() : sLanguage;
@@ -1998,7 +2024,7 @@ sap.ui.define([
 			return sLangStr;
 		}
 
-		if (bIsTinyMCE5Or6) {
+		if (!bIsTinyMCE4) {
 			// If there is region language in the additional languages supported in TinyMCE5, return it
 			if (RichTextEditor.SUPPORTED_LANGUAGES_TINYMCE5[sLangStr]) {
 				return sLangStr;
@@ -2078,7 +2104,7 @@ sap.ui.define([
 	 * @private
 	 */
 	RichTextEditor.prototype._registerWithPopupTinyMCE = function() {
-		var bIsTinyMCE5Or6 = [RichTextEditor.EDITORTYPE_TINYMCE5, RichTextEditor.EDITORTYPE_TINYMCE6].includes(this.getEditorType()),
+		var bIsTinyMCE4 = RichTextEditor.EDITORTYPE_TINYMCE4 === this.getEditorType() || RichTextEditor.EDITORTYPE_TINYMCE === this.getEditorType(),
 			$Pop = this.$().closest("[data-sap-ui-popup]");
 
 		setTimeout(function() {
@@ -2087,16 +2113,16 @@ sap.ui.define([
 
 				if (this._oEditor) {
 					this._oEditor.on('OpenWindow', function(oEvent) {
-						if (bIsTinyMCE5Or6) { // sets our own id to the newly created dialog, because in TinyMCE5 doesn't set id
+						if (!bIsTinyMCE4) { // sets our own id to the newly created dialog, because in TinyMCE5 doesn't set id
 							jQuery(".tox-dialog[role='dialog']").attr("id", sDialogId);
 						}
-						var sSelector = "#" + (bIsTinyMCE5Or6 ? sDialogId : oEvent.win._id);
+						var sSelector = "#" + (!bIsTinyMCE4 ? sDialogId : oEvent.win._id);
 						Popup.addExternalContent(sSelector, /* marked as selectable */ true);
 					});
 					this._oEditor.on('CloseWindow', function(oEvent) {
-						var sSelector = "#" + (bIsTinyMCE5Or6 ? sDialogId : oEvent.win._id);
+						var sSelector = "#" + (!bIsTinyMCE4 ? sDialogId : oEvent.win._id);
 						Popup.removeExternalContent(sSelector, /* remove selectable */ true);
-						if (bIsTinyMCE5Or6) {
+						if (!bIsTinyMCE4) {
 							jQuery(".tox-dialog[role='dialog']").attr("id"); // remove our id
 						}
 					});

package/src/sap/ui/richtexteditor/ToolbarWrapper.js

@@ -1344,7 +1344,7 @@ sap.ui.define([
 						var oNativeAPI = oRTE.getNativeApi();
 						var oTableElm;
 
-						if (oRTE.getEditorType() === library.EditorType.TinyMCE6) {
+						if (oRTE.getEditorType() === library.EditorType.TinyMCE6 || oRTE.getEditorType() === library.EditorType.TinyMCE7) {
 							oNativeAPI.execCommand('mceInsertTable', false, { rows: oRowsInput.getValue(), columns: oColsInput.getValue() });
 
 							oTableElm = oDomRef.getParents(oNativeAPI.selection.getNode()).find(function (element) {