@sapui5/sap.ui.richtexteditor 1.120.34 → 1.120.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.richtexteditor",
-  "version": "1.120.34",
+  "version": "1.120.36",
   "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-2023 SAP SE. All rights reserved.</copyright>
-	<version>1.120.34</version>
+	<version>1.120.36</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.120.34
+		 * @version 1.120.36
 		 */
 		var RTESplitButton = SplitButton.extend("sap.ui.richtexteditor.RTESplitButton", {
 			metadata: {

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

@@ -199,13 +199,13 @@ sap.ui.define([
 				 * not an enumeration).
 				 *
 				 * <b>Notes:</b>
-				 * <ul><li>TinyMCE version 3 and 4 are no longer supported and cannot be used. If you set the property to TinyMCE, it will load TinyMCE version 6.</li>
+				 * <ul><li>TinyMCE version 3 and 4 are no longer supported and cannot be used. If you set the property to TinyMCE, it will load TinyMCE version 7.</li>
 				 * <li>Any attempts to set this property after the first rendering will not
 				 * have any effect.</li>
 				 * <li>The default value of the property will always resolve to the recommended version by UI5. Due to the different support cycles, we will be constantly getting newer TinyMCE versions and update the default value accordingly.</li>
 				 * <li>Usage of internal TinyMCE APIs is not recommended, since it might lead to issues upon TinyMCE version update.</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 will be removed in future releases.</li>
+				 * <li>TinyMCE 5 and TinyMCE 6 will be removed in future releases.</li>
 				 * </ul>
 				 */
 				editorType: { type: "string", group: "Misc", defaultValue: 'TinyMCE' },
@@ -216,7 +216,7 @@ sap.ui.define([
 				 * @deprecated Since version 1.25.0.
 				 * The editorLocation is set implicitly when choosing the editorType.
 				 */
-				editorLocation: { type: "string", group: "Misc", defaultValue: 'js/tiny_mce6/tinymce.js', deprecated: true },
+				editorLocation: { type: "string", group: "Misc", defaultValue: 'js/tiny_mce7/tinymce.js', deprecated: true },
 
 				/**
 				 * Determines whether the editor content can be modified by the user. When set to "false" there might not be any editor toolbar.
@@ -306,7 +306,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
@@ -398,19 +398,23 @@ sap.ui.define([
 
 	RichTextEditor.EDITORTYPE_TINYMCE6 = library.EditorType.TinyMCE6;
 
+	RichTextEditor.EDITORTYPE_TINYMCE7 = library.EditorType.TinyMCE7;
+
 	// default
 	RichTextEditor.EDITORTYPE_TINYMCE = library.EditorType.TinyMCE;
 
+
 	var EDITOR_LOCATION_MAPPING = {};
 
 	// default
-	EDITOR_LOCATION_MAPPING[RichTextEditor.EDITORTYPE_TINYMCE] = "js/tiny_mce6/tinymce.min.js";
+	EDITOR_LOCATION_MAPPING[RichTextEditor.EDITORTYPE_TINYMCE] = "js/tiny_mce7/tinymce.min.js";
 
 	/**
 	 * @deprecated As of version 1.120
 	 */
 	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";
 
 	/**
 	 * @deprecated As of version 1.120
@@ -427,6 +431,7 @@ sap.ui.define([
 		"textpattern",
 		"powerpaste"
 	];
+
 	RichTextEditor.DEFAULT_PLUGINS_TINYMCE6 = [
 		"emoticons",
 		"directionality",
@@ -436,6 +441,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",
@@ -542,23 +556,6 @@ sap.ui.define([
 		"zh_TW": true
 	};
 
-	/**
-	 * @deprecated As of version 1.120
-	 */
-	RichTextEditor.SUPPORTED_LANGUAGES_TINYMCE5 = {
-		"eo": true,
-		"es_ES": true,
-		"it_IT": true,
-		"ro_RO": true
-	};
-
-	RichTextEditor.SUPPORTED_LANGUAGES_TINYMCE6 = {
-		"eo": true,
-		"es_ES": true,
-		"it_IT": true,
-		"ro_RO": true
-	};
-
 	RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS = {
 		"zh": "CN",
 		"fr": "FR",
@@ -584,7 +581,7 @@ sap.ui.define([
 		"vi": "VN"
 	};
 
-	RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE6 = {
+	RichTextEditor.SUPPORTED_LANGUAGES_DEFAULT_REGIONS_TINYMCE7 = {
 		"zh": "CN",
 		"fr": "FR",
 		"bn": "BD",
@@ -610,7 +607,7 @@ sap.ui.define([
 	var oEditorMapping = {};
 
 	// default
-	oEditorMapping[RichTextEditor.EDITORTYPE_TINYMCE] = RichTextEditor.EDITORTYPE_TINYMCE6;
+	oEditorMapping[RichTextEditor.EDITORTYPE_TINYMCE] = RichTextEditor.EDITORTYPE_TINYMCE7;
 
 	/**
 	 * @deprecated As of version 1.120
@@ -619,6 +616,7 @@ sap.ui.define([
 
 	// other versions
 	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
@@ -1173,8 +1171,9 @@ sap.ui.define([
 		};
 
 		var mapping = {
-			"TinyMCE": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE6),
-			"TinyMCE6": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE6)
+			"TinyMCE": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE7),
+			"TinyMCE6": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE6),
+			"TinyMCE7": fnMapPluginList(RichTextEditor.DEFAULT_PLUGINS_TINYMCE7)
 		};
 
 		/**
@@ -1186,7 +1185,8 @@ sap.ui.define([
 
 		var fontButtonGroupButtoNamesMapping = {
 			"TinyMCE": ["fontfamily", "fontsize", "forecolor", "backcolor"],
-			"TinyMCE6": ["fontfamily", "fontsize", "forecolor", "backcolor"]
+			"TinyMCE6": ["fontfamily", "fontsize", "forecolor", "backcolor"],
+			"TinyMCE7": ["fontfamily", "fontsize", "forecolor", "backcolor"]
 		};
 
 		/**
@@ -1294,7 +1294,11 @@ sap.ui.define([
 			 * @deprecated As of version 1.120
 			 */
 			if (oEditorMapping[sEditorType] === "TinyMCE5") {
-				Log.warning("TinyMCE version 5 is used as editor type. TinyMCE 5 is depreacated and will be removed from the code entirely in future.");
+				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();
@@ -1509,6 +1513,9 @@ sap.ui.define([
 			return window.tinymce.majorVersion != "6";
 		}
 
+		if (sEditorType === RichTextEditor.EDITORTYPE_TINYMCE7) {
+			return window.tinymce.majorVersion != "7";
+		}
 		return false;
 	};
 
@@ -1882,16 +1889,17 @@ sap.ui.define([
 			sPluginsList = sPluginsList.replace(/(,powerpaste|powerpaste,)/gi, "");
 		}
 
-		var bIsTinyMCE6 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6 || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE;
+		var bIsTinyMCE6or7 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6 || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE7;
 
 		// 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";
 			});
@@ -1918,6 +1926,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();
@@ -1949,7 +1960,7 @@ sap.ui.define([
 		var oLocale = new Locale(Core.getConfiguration().getLanguage()),
 			sLanguage = oLocale.getLanguage(),
 			sRegion = oLocale.getRegion(),
-			bIsTinyMCE6 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6 || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE,
+			bIsTinyMCE6or7 = this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE6 || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE || this.getEditorType() === RichTextEditor.EDITORTYPE_TINYMCE7,
 			sLangStr;
 
 		// Language mapping for old/fallback languages
@@ -1957,7 +1968,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;
@@ -1967,16 +1978,6 @@ sap.ui.define([
 			return sLangStr;
 		}
 
-		// If there is region language in the additional languages supported in TinyMCE6, return it
-		if (RichTextEditor.SUPPORTED_LANGUAGES_TINYMCE6[sLangStr]) {
-			return sLangStr;
-		}
-
-		// If there is language in the additional languages supported in TinyMCE6, return it
-		if (RichTextEditor.SUPPORTED_LANGUAGES_TINYMCE6[sLanguage]) {
-			return sLanguage;
-		}
-
 		// If there is a some language, return it
 		if (RichTextEditor.SUPPORTED_LANGUAGES_TINYMCE[sLanguage]) {
 			return sLanguage;

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

@@ -1359,7 +1359,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) {