@openui5/sap.ui.fl 1.84.49 → 1.84.51

package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @deprecated Since version 1.73
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/fieldExt/Access.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.fieldExt.Access
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 */
 	var Access = {};
 

package/src/sap/ui/fl/initial/_internal/Storage.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.Storage
 	 * @since 1.67
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/initial/_internal/StorageUtils.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.StorageUtils
 	 * @since 1.74
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage, sap.ui.fl.write._internal.Storage,
 	 * 	sap.ui.fl.initial._internal.connectors.ObjectStorageConnector, sap.ui.fl.initial._internal.connectors.ObjectPathConnector

package/src/sap/ui/fl/initial/_internal/connectors/Utils.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.connectors, sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/initial/_internal/storageResultDisassemble.js

@@ -50,7 +50,7 @@ function(
 	/**
 	 * @namespace sap.ui.fl.initial._internal.StorageResultDisassemble
 	 * @since 1.70
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage
 	 * Disassembles a response with a variant section into one or more plain responses.

package/src/sap/ui/fl/interfaces/BaseLoadConnector.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @namespace sap.ui.fl.interfaces.BaseLoadConnector
 	 * @since 1.79
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @public
 	 * @interface
 	 */

package/src/sap/ui/fl/interfaces/Delegate.js

@@ -103,7 +103,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.interfaces.Delegate
 	 * @experimental Since 1.78
 	 * @since 1.78
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @public
 	 * @interface
 	 */

package/src/sap/ui/fl/library.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * changes or other flex objects that need processing. If there is nothing to
 	 * process, any further flex processing is stopped to avoid runtime impact for end users.
 	 *
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @namespace
 	 * @name sap.ui.fl.initial
 	 * @public
@@ -34,7 +34,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.initial.api</code> namespace contains public APIs that can be used
 	 * during app startup, e.g. to inherit classes to create their own logic for retrieving data for flexibility.
 	 *
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @namespace
 	 * @name sap.ui.fl.initial.api
 	 * @public
@@ -45,7 +45,7 @@ sap.ui.define([
 	 * start a UI5 app for an end user with changes. Be aware that only the <code>api</code>
 	 * sub-namespace contains public and stable APIs.
 	 *
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @namespace
 	 * @name sap.ui.fl.apply
 	 * @public
@@ -55,7 +55,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.apply.api</code> namespace contains public APIs that can be used
 	 * during app startup, e.g. to wait for changes to be applied or to access the current variant.
 	 *
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @namespace
 	 * @name sap.ui.fl.apply.api
 	 * @public
@@ -67,7 +67,7 @@ sap.ui.define([
 	 * by personalization dialogs or 'tools' like key user adaptation will be part of this namespace.
 	 * Be aware that only the <code>api</code> sub-namespace contains public and stable APIs.
 	 *
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @namespace
 	 * @name sap.ui.fl.write
 	 * @public
@@ -76,7 +76,7 @@ sap.ui.define([
 	/**
 	 * The <code>sap.ui.fl.write.api</code> namespace contains public APIs to work with flex objects.
 	 *
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @namespace
 	 * @name sap.ui.fl.write.api
 	 * @public
@@ -86,7 +86,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.interfaces</code> namespace contains only interface jsdoc descriptions.
 	 * It does not contain running code.
 	 *
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @namespace
 	 * @name sap.ui.fl.interfaces
 	 * @public
@@ -139,13 +139,13 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted UI5 controls and tools creating flexibility changes
 	 */
 	sap.ui.getCore().initLibrary({
 		name: "sap.ui.fl",
-		version: "1.84.49",
+		version: "1.84.51",
 		controls: [
 			"sap.ui.fl.variants.VariantManagement",
 			"sap.ui.fl.util.IFrame"

package/src/sap/ui/fl/messagebundle_ar.properties

@@ -1,5 +1,5 @@
 
-TRANSPORT_DIALOG_TITLE=\u062A\u062D\u062F\u064A\u062F \u0627\u0644\u062D\u0632\u0645\u0629 \u0648 \u0639\u0645\u0644\u064A\u0629 \u0627\u0644\u0646\u0642\u0644
+TRANSPORT_DIALOG_TITLE=\u062A\u062D\u062F\u064A\u062F \u0627\u0644\u062D\u0632\u0645\u0629 \u0648\u0627\u0644\u0646\u0642\u0644
 
 TRANSPORT_DIALOG_TITLE_SIMPLE=\u062A\u062D\u062F\u064A\u062F \u0639\u0645\u0644\u064A\u0629 \u0646\u0642\u0644
 

package/src/sap/ui/fl/messagebundle_de.properties

@@ -93,7 +93,7 @@ HEADER_TRANSPORT_ERROR=Fehler
 
 MSG_TRANSPORT_SUCCESS=Ihre UI-\u00C4nderungen wurden in den Transport aufgenommen.
 
-MSG_ATO_NOTIFICATION=Ver\u00F6ffentlichung erfolgreich. Ihre \u00C4nderungen sind nun bereit f\u00FCr den Export in eine Software-Kollektion.
+MSG_ATO_NOTIFICATION=Ver\u00F6ffentlichung erfolgreich. Ihre \u00C4nderungen sind nun bereit f\u00FCr den Export in eine Softwarekollektion.
 
 MSG_TRANSPORT_ERROR=Ihre UI-\u00C4nderungen k\u00F6nnen momentan nicht transportiert werden. Bitte versuchen Sie es sp\u00E4ter erneut, oder wenden Sie sich an den Administrator\: {0}
 

package/src/sap/ui/fl/messagebundle_kk.properties

@@ -89,7 +89,7 @@ VARIANT_COPY_SINGLE_TEXT={0} \u041A\u04E9\u0448\u0456\u0440\u0443
 
 VARIANT_COPY_MULTIPLE_TEXT={0} \u041A\u04E9\u0448\u0456\u0440\u0443 ({1})
 
-HEADER_TRANSPORT_ERROR=\u049A\u0430\u0442\u0435\u043B\u0456\u043A
+HEADER_TRANSPORT_ERROR=\u049A\u0430\u0442\u0435
 
 MSG_TRANSPORT_SUCCESS=UI \u04E9\u0437\u0433\u0435\u0440\u0456\u0441\u0442\u0435\u0440\u0456 \u0442\u0430\u0441\u044B\u043C\u0430\u043B\u0493\u0430 \u049B\u043E\u0441\u044B\u043B\u0434\u044B.
 

package/src/sap/ui/fl/messagebundle_pl.properties

@@ -63,7 +63,7 @@ VARIANT_MANAGEMENT_ERROR_EMPTY=Podaj nazw\u0119 widoku
 
 VARIANT_MANAGEMENT_NOT_ALLOWED_CHAR=Znak {0} nie jest dozwolony dla nazw widok\u00F3w
 
-VARIANT_MANAGEMENT_MAX_LEN=D\u0142ugo\u015B\u0107 nazw widok\u00F3w jest ograniczona do znak\u00F3w\: {0}.
+VARIANT_MANAGEMENT_MAX_LEN=D\u0142ugo\u015B\u0107 nazw widok\u00F3w jest ograniczona do {0} znak\u00F3w
 
 VARIANT_MANAGEMENT_TRIGGER_TT=Wybierz widok
 

package/src/sap/ui/fl/messagebundle_sl.properties

@@ -1,19 +1,19 @@
 
-TRANSPORT_DIALOG_TITLE=Izbira in prenos paketa
+TRANSPORT_DIALOG_TITLE=Izberite in prenesite paket
 
-TRANSPORT_DIALOG_TITLE_SIMPLE=Izbira prenosa
+TRANSPORT_DIALOG_TITLE_SIMPLE=Izberite prenos
 
 TRANSPORT_DIALOG_OK=V redu
 
-TRANSPORT_DIALOG_CANCEL=Prekinitev
+TRANSPORT_DIALOG_CANCEL=Prekli\u010Di
 
 TRANSPORT_DIALOG_TRANSPORT=Prenos
 
 TRANSPORT_DIALOG_PACKAGE=Paket
 
-TRANSPORT_DIALOG_TRANSPORT_TT=Izbira prenosa
+TRANSPORT_DIALOG_TRANSPORT_TT=Izberite prenos
 
-TRANSPORT_DIALOG_PACKAGE_TT=Izbira paketa
+TRANSPORT_DIALOG_PACKAGE_TT=Izberite paket
 
 TRANSPORT_DIALOG_NO_TRANSPORT=Kreiranje zahteve za prenos
 
@@ -47,7 +47,7 @@ VARIANT_MANAGEMENT_DEFAULT=Privzeto
 
 VARIANT_MANAGEMENT_EXECUTEONSELECT=Samodejna uveljavitev
 
-VARIANT_MANAGEMENT_AUTHOR=Kreiral
+VARIANT_MANAGEMENT_AUTHOR=Ustvaril uporabnik
 
 VARIANT_MANAGEMENT_ACTION_COLUMN=Akcija
 

package/src/sap/ui/fl/messagebundle_sv.properties

@@ -79,7 +79,7 @@ VARIANT_MANAGEMENT_FAV_ADD_TOOLTIP=L\u00E4gg till som favorit
 
 VARIANT_MANAGEMENT_ERROR_TEXT1=Data kan inte l\u00E4sas in.
 
-VARIANT_MANAGEMENT_ERROR_TEXT2=Det \u00E4r m\u00F6jligt att internetuppkoppling saknas eller att bakomliggande system eller komponent inte \u00E4r tillg\u00E4ngliga.
+VARIANT_MANAGEMENT_ERROR_TEXT2=Det \u00E4r m\u00F6jligt att internetanslutning saknas eller att bakomliggande system eller komponent inte \u00E4r tillg\u00E4ngliga.
 
 STANDARD_VARIANT_ORIGINAL_TITLE=Standard
 

package/src/sap/ui/fl/messagebundle_uk.properties

@@ -73,7 +73,7 @@ VARIANT_MANAGEMENT_FAV_ADD_ACC=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\
 
 VARIANT_MANAGEMENT_FAV_DEL_ACC=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0430 \u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u044F\u043A \u043E\u0431\u0440\u0430\u043D\u0435 \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u0435\u043D\u0430
 
-VARIANT_MANAGEMENT_FAV_DEL_TOOLTIP=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0437 \u041E\u0431\u0440\u0430\u043D\u043E\u0433\u043E
+VARIANT_MANAGEMENT_FAV_DEL_TOOLTIP=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0437 \u0443\u043B\u044E\u0431\u043B\u0435\u043D\u0438\u0445
 
 VARIANT_MANAGEMENT_FAV_ADD_TOOLTIP=\u0414\u043E\u0434\u0430\u0442\u0438 \u044F\u043A \u041E\u0431\u0440\u0430\u043D\u0435
 
@@ -95,7 +95,7 @@ MSG_TRANSPORT_SUCCESS=\u0412\u0430\u0448\u0456 \u0437\u043C\u0456\u043D\u0438 \u
 
 MSG_ATO_NOTIFICATION=\u041F\u0443\u0431\u043B\u0456\u043A\u0430\u0446\u0456\u044F \u0432\u0438\u043A\u043E\u043D\u0430\u043D\u0430 \u0443\u0441\u043F\u0456\u0448\u043D\u043E. \u0412\u0430\u0448\u0456 \u0437\u043C\u0456\u043D\u0438 \u0433\u043E\u0442\u043E\u0432\u0456 \u0434\u043E \u0435\u043A\u0441\u043F\u043E\u0440\u0442\u0443 \u0434\u043E \u043A\u043E\u043B\u0435\u043A\u0446\u0456\u0457 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043D\u043E\u0433\u043E \u0437\u0430\u0431\u0435\u0437\u043F\u0435\u0447\u0435\u043D\u043D\u044F.
 
-MSG_TRANSPORT_ERROR=\u0412\u0438\u0431\u0430\u0447\u0442\u0435, \u0432\u0430\u0448\u0456 \u0437\u043C\u0456\u043D\u0438 \u0456\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0443 \u043D\u0430\u0440\u0430\u0437\u0456 \u043D\u0435\u043C\u043E\u0436\u043B\u0438\u0432\u043E \u043F\u0435\u0440\u0435\u043D\u0435\u0441\u0442\u0438. \u041F\u043E\u0432\u0442\u043E\u0440\u0456\u0442\u044C \u0441\u043F\u0440\u043E\u0431\u0443 \u043F\u0456\u0437\u043D\u0456\u0448\u0435 \u0430\u0431\u043E \u0437\u0432\u0435\u0440\u043D\u0456\u0442\u044C\u0441\u044F \u0434\u043E \u0430\u0434\u043C\u0456\u043D\u0456\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0430\: {0}
+MSG_TRANSPORT_ERROR=\u0412\u0438\u0431\u0430\u0447\u0442\u0435, \u0432\u0430\u0448\u0456 \u0437\u043C\u0456\u043D\u0438 \u0456\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0443 \u043D\u0430\u0440\u0430\u0437\u0456 \u043D\u0435\u043C\u043E\u0436\u043B\u0438\u0432\u043E \u043F\u0435\u0440\u0435\u043D\u0435\u0441\u0442\u0438. \u041F\u043E\u0432\u0442\u043E\u0440\u0456\u0442\u044C \u0441\u043F\u0440\u043E\u0431\u0443 \u043F\u0456\u0437\u043D\u0456\u0448\u0435 \u0430\u0431\u043E \u0437\u0432\u0435\u0440\u043D\u0456\u0442\u044C\u0441\u044F \u0434\u043E \u0441\u0432\u043E\u0433\u043E \u0430\u0434\u043C\u0456\u043D\u0456\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0430\: {0}
 
 MSG_NETWORK_ERROR=\u041F\u043E\u043C\u0438\u043B\u043A\u0430 \u043C\u0435\u0440\u0435\u0436\u0456.
 

package/src/sap/ui/fl/registry/ChangeRegistry.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeRegistry
 	 *
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.27.0
 	 *
 	 */

package/src/sap/ui/fl/registry/ChangeRegistryItem.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeRegistryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.27.0
 	 *
 	 */

package/src/sap/ui/fl/registry/ChangeTypeMetadata.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeTypeMetadata
 	 *
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.27.0
 	 *
 	 */

package/src/sap/ui/fl/registry/SimpleChanges.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.SimpleChanges
 	 *
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.27.0
 	 *
 	 */

package/src/sap/ui/fl/support/Flexibility.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 *
 		 * @abstract
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.84.49
+		 * @version 1.84.51
 		 * @private
 		 * @ui5-restricted
 		 * @constructor

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails", {

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit", {

package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster", {

package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.Layers
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.Layers", {

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.45
 	 */
 	var LrepConnector = {};

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/GroupHeaderListItem", "sap/ui/thirdparty/jquery"],
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 		 * @author SAP SE
-		 * @version 1.84.49
+		 * @version 1.84.51
 		 * @experimental Since 1.45
 		 */
 		var DataUtils = {

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -16,7 +16,7 @@ sap.ui.define([
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.84.49
+		 * @version 1.84.51
 		 * @experimental Since 1.45
 		 */
 		var ErrorUtils = {};

package/src/sap/ui/fl/support/diagnostics/Flexibility.controller.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.Flexibility
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @experimental Since 1.52
 	 */
 	return Controller.extend("sap.ui.fl.support.diagnostics.Flexibility", {

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/util/IFrame.js

@@ -7,24 +7,25 @@
 // Provides control sap.ui.fl.util.IFrame
 sap.ui.define([
 	"../library",
+	"sap/base/util/uid",
 	"sap/ui/core/Control",
 	"sap/ui/model/json/JSONModel",
 	"./getContainerUserInfo",
 	"sap/base/util/extend",
 	"sap/base/security/URLWhitelist",
-	"sap/base/util/restricted/_CancelablePromise",
 	"sap/base/Log",
-	"sap/ui/core/library",
-	"./IFrameRenderer"
+	"./IFrameRenderer",
+	"sap/ui/core/library"
 ], function(
 	library,
+	uid,
 	Control,
 	JSONModel,
 	getContainerUserInfo,
 	extend,
 	URLWhitelist,
-	CancelablePromise,
-	Log
+	Log,
+	IFrameRenderer
 ) {
 	"use strict";
 
@@ -52,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 *
 	 * @constructor
 	 * @private
@@ -109,36 +110,56 @@ sap.ui.define([
 			var sEncodedUrl = decodeURI(sUrl) === sUrl ? encodeURI(sUrl) : sUrl;
 
 			if (IFrame.isValidUrl(sEncodedUrl)) {
-				// Setting the url of the IFrame directly can lead to issues
-				// if the change doesn't result in a reload of the embedded page
-				// e.g. when a navigation parameter is changed
-				// To avoid problems with the ushell and the embedded apps, it is safer
-				// to unload the iframe content first and thus force a full browser reload
-
-				if (this._oSetUrlPromise) {
-					this._oSetUrlPromise.cancel();
-					delete this._oSetUrlPromise;
+				// Set by replacing the last entry
+				var oNewUrl = IFrame._toUrl(sEncodedUrl);
+				var oOldUrl = IFrame._toUrl(this.getUrl() || "about:blank");
+				if (oOldUrl.searchParams.has("sap-ui-xx-fl-forceEmbeddedContentRefresh")) {
+					// Always keep the refresh parameter and update it to avoid false negatives
+					// when the URL doesn't change except for the refresh parameter itself + hash
+					oNewUrl.searchParams.set("sap-ui-xx-fl-forceEmbeddedContentRefresh", uid().substring(3));
+				} else if (
+					oOldUrl.origin === oNewUrl.origin
+					&& oOldUrl.pathname === oNewUrl.pathname
+					&& oOldUrl.search === oNewUrl.search
+					&& oOldUrl.hash !== oNewUrl.hash
+				) {
+					// Only the hash changed, site is not going to reload automatically
+					// Set an artificial search parameter to force a refresh
+					oNewUrl.searchParams.append("sap-ui-xx-fl-forceEmbeddedContentRefresh", uid().substring(3));
 				}
-
-				this.setProperty("url", "");
-
-				this._oSetUrlPromise = new CancelablePromise(function (fnResolve, fnReject, onCancel) {
-					onCancel.shouldReject = false;
-					// Use a timeout here to avoid issues with browser caching in Chrome
-					// that seem to lead to a mismatch between IFrame content and src,
-					// see Chromium issue 324102
-					setTimeout(fnResolve, 0);
-				});
-
-				this._oSetUrlPromise.then(function() {
-					this.setProperty("url", sEncodedUrl);
-				}.bind(this));
+				this.setProperty("url", oNewUrl.toString());
 			} else {
 				Log.error("Provided URL is not valid as an IFrame src");
 			}
 			return this;
 		},
 
+		// Used for testing since retrieving or spying on the Iframe location
+		// is not possible due to cross-origin restrictions
+		_replaceIframeLocation: function (sNewUrl) {
+			this.getDomRef().contentWindow.location.replace(sNewUrl);
+		},
+
+		onAfterRendering: function () {
+			this._replaceIframeLocation(this.getUrl());
+
+			// The contentWindow might change without causing a rerender, e.g.
+			// when the parent element changes due to an appendChild call
+			// This will cause the iframe src to change and we need to replace the
+			// location again to ensure the correct content
+			this._oLastContentWindow = this.getDomRef().contentWindow;
+			this.getDomRef().addEventListener("load", function() {
+				if (!this.getDomRef()) {
+					// The iframe was removed before the load event was triggered
+					return;
+				}
+				if (this._oLastContentWindow !== this.getDomRef().contentWindow) {
+					this._oLastContentWindow = this.getDomRef().contentWindow;
+					this._replaceIframeLocation(this.getUrl());
+				}
+			}.bind(this));
+		},
+
 		applySettings: function (mSettings) {
 			Control.prototype.applySettings.apply(this, arguments);
 			if (mSettings) {
@@ -163,18 +184,40 @@ sap.ui.define([
 				this._oUserModel.destroy();
 				delete this._oUserModel;
 			}
-		}
+		},
 
+		renderer: IFrameRenderer
 	});
 
+	// Used for test stubbing
+	IFrame._getDocumentLocation = function() {
+		return document.location;
+	};
+
+	IFrame._toUrl = function(sUrl) {
+		var oDocumentLocation = IFrame._getDocumentLocation();
+		return new window.URL(sUrl, oDocumentLocation.href);
+	};
+
 	IFrame.isValidUrl = function(sUrl) {
-		// Make sure that pseudo protocols are not allowed as IFrame src
-		return (
-			!URLWhitelist.entries().some(function(oValidatorEntry) {
-				return /javascript/i.test(oValidatorEntry.protocol);
-			})
-			&& URLWhitelist.validate(sUrl)
-		);
+		try {
+			var oUrl = IFrame._toUrl(sUrl);
+
+			// Make sure that pseudo protocols are not allowed as IFrame src
+			return (
+				!/javascript/i.test(oUrl.protocol)
+				&& (
+					// Forbid unsafe http embedding within https to conform with mixed content security restrictions
+					!/http(?!s)/.test(oUrl.protocol)
+					// Exception: Host is using http, no protocol downgrade happening
+					// Required for local testing and onPrem systems
+					|| /http(?!s)/.test(IFrame._getDocumentLocation().protocol)
+				)
+				&& URLWhitelist.validate(sUrl)
+			);
+		} catch (error) {
+			return false;
+		}
 	};
 
 	return IFrame;

package/src/sap/ui/fl/util/IFrameRenderer.js

@@ -40,7 +40,8 @@ sap.ui.define([
 		oRm.style("border", "none");
 
 		oRm.attr("sandbox", "allow-forms allow-popups allow-scripts allow-same-origin");
-		oRm.attr("src", oIFrame.getUrl());
+		// Always set the src to about:blank to avoid adding history entries when parameters are resolved
+		oRm.attr("src", "about:blank");
 		var sTitle = oIFrame.getTitle();
 		if (sTitle) {
 			oRm.attr("title", sTitle);

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/variants/VariantModel.js

@@ -240,7 +240,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {sap.ui.fl.FlexController} oFlexController - <code>FlexController</code> instance for the component which uses the variant model
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance that is currently loading

package/src/sap/ui/fl/write/_internal/Storage.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/Versions.js

@@ -154,7 +154,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.84.49
+	 * @version 1.84.51
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */