@openui5/sap.m 1.120.6 → 1.121.0

package/src/sap/m/p13n/modification/FlexModificationHandler.js

@@ -4,147 +4,165 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-    "./ModificationHandler",
-    "sap/m/p13n/FlexUtil",
-    "sap/m/p13n/enum/PersistenceMode",
-    "sap/ui/core/Core"
-], function(ModificationHandler, FlexUtil, mode, Core) {
+	"./ModificationHandler",
+	"sap/m/p13n/FlexUtil",
+	"sap/m/p13n/enums/PersistenceMode",
+	"sap/ui/core/Lib",
+	"sap/ui/core/Element"
+], (ModificationHandler, FlexUtil, mode, Library, Element) => {
 	"use strict";
 
-    var oFlexModificationHandler, pInitialize, pRuntimeAPI, pWriteAPI;
-
-    var _requireFlexRuntimeAPI = function() {
-        if (!pRuntimeAPI) {
-            pRuntimeAPI = new Promise(function (resolve, reject) {
-                sap.ui.require([
-                    "sap/ui/fl/apply/api/FlexRuntimeInfoAPI"
-                ], function (FlexRuntimeInfoAPI) {
-                    resolve(FlexRuntimeInfoAPI);
-                }, reject);
-            });
-        }
-        return pRuntimeAPI;
-    };
-
-    var _requireWriteAPI = function() {
-        if (!pWriteAPI) {
-            pWriteAPI = new Promise(function (resolve, reject) {
-                sap.ui.require([
-                    "sap/ui/fl/write/api/ControlPersonalizationWriteAPI"
-                ], function (ControlPersonalizationWriteAPI) {
-                    resolve(ControlPersonalizationWriteAPI);
-                });
-            });
-        }
-        return pWriteAPI;
-    };
-
-    /**
+	let oFlexModificationHandler, pInitialize, pRuntimeAPI, pWriteAPI;
+
+	const _requireFlexRuntimeAPI = () => {
+		if (!pRuntimeAPI) {
+			pRuntimeAPI = new Promise((resolve, reject) => {
+				sap.ui.require([
+					"sap/ui/fl/apply/api/FlexRuntimeInfoAPI"
+				], (FlexRuntimeInfoAPI) => {
+					resolve(FlexRuntimeInfoAPI);
+				}, reject);
+			});
+		}
+		return pRuntimeAPI;
+	};
+
+	const _requireWriteAPI = () => {
+		if (!pWriteAPI) {
+			pWriteAPI = new Promise((resolve, reject) => {
+				sap.ui.require([
+					"sap/ui/fl/write/api/ControlPersonalizationWriteAPI"
+				], (ControlPersonalizationWriteAPI) => {
+					resolve(ControlPersonalizationWriteAPI);
+				});
+			});
+		}
+		return pWriteAPI;
+	};
+
+	/**
 	 * @class This class offers <code>sap.ui.fl</code> capabilities.
-     * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
+	 * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
 	 *
 	 * @author SAP SE
 	 * @private
-     * @experimental Since 1.104.
+	 * @experimental Since 1.104.
 	 * @alias sap.m.p13n.modification.FlexModificationHandler
 	 */
-	var FlexModificationHandler = ModificationHandler.extend("sap.m.p13n.modification.FlexModificationHandler");
-
-    FlexModificationHandler.prototype.processChanges = function(aChanges, oModificationPayload){
-        var oControl = aChanges && aChanges[0] ? aChanges[0].selectorElement : undefined;
-
-        var sInternalPersistenceMode = oModificationPayload.mode;
-
-        /**
-         * In case of 'Auto' we internally overwrite the persistence mode to use the VM
-         * in case it has been provided instead of the PP
-         */
-        var bIsAutoGlobal = sInternalPersistenceMode === mode.Auto;
-        if (bIsAutoGlobal) {
-            sInternalPersistenceMode = oModificationPayload.hasVM ? "Standard" : mode.Global;
-        }
-
-        var bIsGlobal = sInternalPersistenceMode === mode.Global;
-
-        var bIsTransient = sInternalPersistenceMode === mode.Transient;
-
-        return this.initialize()
-        .then(function(){
-
-            var oHandleChangesPromise = FlexUtil.handleChanges(aChanges, bIsGlobal, bIsTransient);
-            return bIsGlobal ? oHandleChangesPromise.then(function(aDirtyChanges){
-                return FlexUtil.saveChanges(oControl, aDirtyChanges);
-            }) : oHandleChangesPromise;
-        });
-    };
-
-    FlexModificationHandler.prototype.waitForChanges = function(mPropertyBag, oModificationPayload){
-        return this.initialize()
-        .then(function(){
-            return _requireFlexRuntimeAPI().then(function(FlexRuntimeInfoAPI){
-                return FlexRuntimeInfoAPI.waitForChanges(mPropertyBag, oModificationPayload);
-            });
-        });
-    };
-
-    FlexModificationHandler.prototype.hasChanges = function(mPropertyBag, oModificationPayload){
-
-        var sInternalPersistenceMode = oModificationPayload.mode;
-
-        if (sInternalPersistenceMode === mode.Auto) {
-            sInternalPersistenceMode = oModificationPayload.hasVM ? "Standard" : mode.Global;
-        }
-
-        return this.initialize()
-        .then(function(){
-            if (sInternalPersistenceMode === mode.Global) {
-                return _requireFlexRuntimeAPI().then(function(FlexRuntimeInfoAPI){
-                    return FlexRuntimeInfoAPI.isPersonalized({selectors: [mPropertyBag.selector]});
-                });
-            } else {
-                return _requireWriteAPI().then(function(ControlPersonalizationWriteAPI){
-                    return ControlPersonalizationWriteAPI.hasDirtyFlexObjects(mPropertyBag);
-                });
-            }
-        });
-    };
-
-    FlexModificationHandler.prototype.reset = function(mPropertyBag, oModificationPayload){
-        var sPersistenceMode = oModificationPayload.mode;
-
-        var bIsGlobal = sPersistenceMode === mode.Global;
-        var bIsAutoGlobal = !oModificationPayload.hasVM && oModificationPayload.hasPP && sPersistenceMode === mode.Auto;
-
-        return this.initialize()
-        .then(function(){
-            return (bIsGlobal || bIsAutoGlobal) ? FlexUtil.reset(mPropertyBag) : FlexUtil.restore(mPropertyBag);
-        });
-    };
-
-    FlexModificationHandler.prototype.isModificationSupported = function(mPropertyBag, oModificationPayload){
-        return this.initialize()
-        .then(function(){
-            return _requireFlexRuntimeAPI().then(function(FlexRuntimeInfoAPI){
-                return FlexRuntimeInfoAPI.isFlexSupported(mPropertyBag, oModificationPayload);
-            });
-        });
-    };
-
-    FlexModificationHandler.prototype.initialize = function() {
-        if (!pInitialize) {
-            pInitialize = Core.loadLibrary('sap.ui.fl', {
-                async: true
-            });
-        }
-        return pInitialize;
-    };
-
-    FlexModificationHandler.getInstance = function() {
-        if (!oFlexModificationHandler){
-            oFlexModificationHandler = new FlexModificationHandler();
-        }
-        return oFlexModificationHandler;
-    };
+	const FlexModificationHandler = ModificationHandler.extend("sap.m.p13n.modification.FlexModificationHandler");
+
+	FlexModificationHandler.prototype.processChanges = async function(aChanges, oModificationPayload) {
+		const oControl = aChanges && aChanges[0] ? aChanges[0].selectorElement : undefined;
+
+		let sInternalPersistenceMode = oModificationPayload.mode;
+
+		/**
+		 * In case of 'Auto' we internally overwrite the persistence mode to use the VM
+		 * in case it has been provided instead of the PP
+		 */
+		const bIsAutoGlobal = sInternalPersistenceMode === mode.Auto;
+		if (bIsAutoGlobal) {
+			sInternalPersistenceMode = oModificationPayload.hasVM ? "Standard" : mode.Global;
+		}
+
+		const bIsGlobal = sInternalPersistenceMode === mode.Global;
+
+		const bIsTransient = sInternalPersistenceMode === mode.Transient;
+
+		const bHandleSequentialy = aChanges.some((oChange) => {
+			return typeof oChange.selectorElement === "string";
+		});
+
+		await this.initialize();
+
+		if (bHandleSequentialy) {
+			return this._processChangesSequentialy(aChanges, oControl, bIsGlobal, bIsTransient);
+		} else {
+			const oHandleChangesPromise = FlexUtil.handleChanges(aChanges, bIsGlobal, bIsTransient);
+			return bIsGlobal ? oHandleChangesPromise.then((aDirtyChanges) => {
+				return FlexUtil.saveChanges(oControl, aDirtyChanges);
+			}) : oHandleChangesPromise;
+		}
+	};
+
+	FlexModificationHandler.prototype._processChangesSequentialy = async function(aChanges, oControl, bIsGlobal, bIsTransient) {
+		await aChanges.reduce(async (oPrevious, oCurrent) => {
+			await oPrevious;
+			if (typeof oCurrent.selectorElement === "string") {
+				oCurrent.selectorElement = Element.getElementById(oCurrent.selectorElement);
+			}
+			const aDirtyChanges = await FlexUtil.handleChanges([oCurrent], bIsGlobal, bIsTransient);
+			if (bIsGlobal) {
+				await FlexUtil.saveChanges(oControl, aDirtyChanges);
+			}
+		}, Promise.resolve());
+	};
+
+	FlexModificationHandler.prototype.waitForChanges = function(mPropertyBag, oModificationPayload) {
+		return this.initialize()
+			.then(() => {
+				return _requireFlexRuntimeAPI().then((FlexRuntimeInfoAPI) => {
+					return FlexRuntimeInfoAPI.waitForChanges(mPropertyBag, oModificationPayload);
+				});
+			});
+	};
+
+	FlexModificationHandler.prototype.hasChanges = function(mPropertyBag, oModificationPayload) {
+
+		let sInternalPersistenceMode = oModificationPayload.mode;
+
+		if (sInternalPersistenceMode === mode.Auto) {
+			sInternalPersistenceMode = oModificationPayload.hasVM ? "Standard" : mode.Global;
+		}
+
+		return this.initialize()
+			.then(() => {
+				if (sInternalPersistenceMode === mode.Global) {
+					return _requireFlexRuntimeAPI().then((FlexRuntimeInfoAPI) => {
+						return FlexRuntimeInfoAPI.isPersonalized({ ...mPropertyBag });
+					});
+				} else {
+					return _requireWriteAPI().then((ControlPersonalizationWriteAPI) => {
+						return ControlPersonalizationWriteAPI.hasDirtyFlexObjects(mPropertyBag);
+					});
+				}
+			});
+	};
+
+	FlexModificationHandler.prototype.reset = function(mPropertyBag, oModificationPayload) {
+		const sPersistenceMode = oModificationPayload.mode;
+
+		const bIsGlobal = sPersistenceMode === mode.Global;
+		const bIsAutoGlobal = !oModificationPayload.hasVM && oModificationPayload.hasPP && sPersistenceMode === mode.Auto;
+
+		return this.initialize()
+			.then(() => {
+				return (bIsGlobal || bIsAutoGlobal) ? FlexUtil.reset(mPropertyBag) : FlexUtil.restore(mPropertyBag);
+			});
+	};
+
+	FlexModificationHandler.prototype.isModificationSupported = function(mPropertyBag, oModificationPayload) {
+		return this.initialize()
+			.then(() => {
+				return _requireFlexRuntimeAPI().then((FlexRuntimeInfoAPI) => {
+					return FlexRuntimeInfoAPI.isFlexSupported(mPropertyBag, oModificationPayload);
+				});
+			});
+	};
+
+	FlexModificationHandler.prototype.initialize = function() {
+		if (!pInitialize) {
+			pInitialize = Library.load({ name: 'sap.ui.fl' });
+		}
+		return pInitialize;
+	};
+
+	FlexModificationHandler.getInstance = () => {
+		if (!oFlexModificationHandler) {
+			oFlexModificationHandler = new FlexModificationHandler();
+		}
+		return oFlexModificationHandler;
+	};
 
 	return FlexModificationHandler;
 });

package/src/sap/m/p13n/modification/LocalStorageModificationHandler.js

@@ -6,43 +6,43 @@
 sap.ui.define([
 	"sap/m/p13n/modification/ModificationHandler",
 	"sap/m/p13n/Engine"
-], function(Modificationhandler, Engine) {
+], (Modificationhandler, Engine) => {
 	"use strict";
 
-	var oLocalStorageModificationHandler;
-	var mInitialState = new WeakMap();
+	let oLocalStorageModificationHandler;
+	const mInitialState = new WeakMap();
 
 	/**
 	 * @class This class offers <code>localStorage</code> persistence capabilities.
-     * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
+	 * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
 	 *
 	 * @author SAP SE
 	 * @private
-     * @experimental Since 1.104.
+	 * @experimental Since 1.104.
 	 * @alias sap.m.p13n.modification.LocalStorageModificationHandler
 	 */
-	var LocalStorageModificationHandler = Modificationhandler.extend("sap.m.p13n.modification.LocalStorageModificationHandler");
+	const LocalStorageModificationHandler = Modificationhandler.extend("sap.m.p13n.modification.LocalStorageModificationHandler");
 
-	LocalStorageModificationHandler.prototype.processChanges = function(aChanges, oModificationPayload){
-        var pAppliance = Modificationhandler.prototype.processChanges.apply(this, arguments);
-        var oControl = aChanges && aChanges[0] ? aChanges[0].selectorElement : undefined;
+	LocalStorageModificationHandler.prototype.processChanges = function(aChanges, oModificationPayload) {
+		const pAppliance = Modificationhandler.prototype.processChanges.apply(this, arguments);
+		const oControl = aChanges && aChanges[0] ? aChanges[0].selectorElement : undefined;
 
-        return pAppliance.then(function(){
-            return Engine.getInstance().retrieveState(oControl)
-            .then(function(oState){
-                localStorage.setItem("$p13n.Engine.data--" + oControl.getId(), JSON.stringify(oState));
-            });
-        });
+		return pAppliance.then(() => {
+			return Engine.getInstance().retrieveState(oControl)
+				.then((oState) => {
+					localStorage.setItem("$p13n.Engine.data--" + oControl.getId(), JSON.stringify(oState));
+				});
+		});
 	};
 
-	LocalStorageModificationHandler.prototype.initialize = function(oControl) {
-        var oInitialState = JSON.parse(localStorage.getItem("$p13n.Engine.data--" + oControl.getId()));
-		var pInitial;
+	LocalStorageModificationHandler.prototype.initialize = (oControl) => {
+		let oInitialState = JSON.parse(localStorage.getItem("$p13n.Engine.data--" + oControl.getId()));
+		let pInitial;
 		if (!oInitialState) {
 			pInitial = Engine.getInstance().retrieveState(oControl)
-			.then(function(oRetrievedState){
-				oInitialState = oRetrievedState;
-			});
+				.then((oRetrievedState) => {
+					oInitialState = oRetrievedState;
+				});
 		} else {
 			pInitial = Engine.getInstance().applyState(oControl, oInitialState, true);
 		}
@@ -51,22 +51,22 @@ sap.ui.define([
 		return pInitial;
 	};
 
-    LocalStorageModificationHandler.prototype.waitForChanges = function(mPropertyBag, oModificationPayload) {
-        return Promise.resolve();
+	LocalStorageModificationHandler.prototype.waitForChanges = (mPropertyBag, oModificationPayload) => {
+		return Promise.resolve();
 	};
 
-	LocalStorageModificationHandler.prototype.reset = function(mPropertyBag, oModificationPayload) {
-		var oControl = mPropertyBag.selector;
+	LocalStorageModificationHandler.prototype.reset = (mPropertyBag, oModificationPayload) => {
+		const oControl = mPropertyBag.selector;
 		localStorage.removeItem("$p13n.Engine.data--" + oControl.getId());
 		return Engine.getInstance().applyState(oControl, mInitialState.get(oControl), true);
 	};
 
-	LocalStorageModificationHandler.prototype.isModificationSupported = function(mPropertyBag, oModificationPayload){
+	LocalStorageModificationHandler.prototype.isModificationSupported = (mPropertyBag, oModificationPayload) => {
 		return false;
 	};
 
-	LocalStorageModificationHandler.getInstance = function() {
-		if (!oLocalStorageModificationHandler){
+	LocalStorageModificationHandler.getInstance = () => {
+		if (!oLocalStorageModificationHandler) {
 			oLocalStorageModificationHandler = new LocalStorageModificationHandler();
 		}
 		return oLocalStorageModificationHandler;

package/src/sap/m/p13n/modification/ModificationHandler.js

@@ -5,21 +5,21 @@
  */
 sap.ui.define([
 	"sap/ui/base/Object"
-], function(BaseObject) {
+], (BaseObject) => {
 	"use strict";
 
-	var oModificationHandler;
+	let oModificationHandler;
 
 	/**
 	 * @class This class offers modification capabilities without persistence.
-     * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
+	 * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
 	 *
 	 * @author SAP SE
 	 * @private
-     * @experimental Since 1.104.
+	 * @experimental Since 1.104.
 	 * @alias sap.m.p13n.modification.ModificationHandler
 	 */
-	var ModificationHandler = BaseObject.extend("sap.m.p13n.modification.ModificationHandler");
+	const ModificationHandler = BaseObject.extend("sap.m.p13n.modification.ModificationHandler");
 
 	/**
 	 * Should implement the appliance of changes
@@ -28,8 +28,8 @@ sap.ui.define([
 	 * @param {object} oModificationPayload An object providing a modification handler specific payload
 	 * @returns {Promise} Returns a <code>Promise</code> reflecting change processing
 	 */
-	ModificationHandler.prototype.processChanges = function(aChanges, oModificationPayload){
-		var aChangeAppliance = [];
+	ModificationHandler.prototype.processChanges = (aChanges, oModificationPayload) => {
+		const aChangeAppliance = [];
 		return Promise.all(aChangeAppliance);
 	};
 
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @returns {Promise} Returns a <code>Promise</code> reflecting change appliance
 
 	 */
-	ModificationHandler.prototype.waitForChanges = function(mPropertyBag, oModificationPayload) {
+	ModificationHandler.prototype.waitForChanges = (mPropertyBag, oModificationPayload) => {
 		return Promise.resolve();
 	};
 
@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @param {object} oModificationPayload An object providing a modification handler specific payload
 	 * @returns {Promise} Returns a <code>Promise</code> reflecting the reset execution
 	 */
-	ModificationHandler.prototype.reset = function(mPropertyBag, oModificationPayload) {
+	ModificationHandler.prototype.reset = (mPropertyBag, oModificationPayload) => {
 		return Promise.resolve();
 	};
 
@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 * @returns {Promise} Returns a <code>Promise</code> to initialize necessary persistence dependencies
 	 */
-	ModificationHandler.prototype.initialize = function(oControl) {
+	ModificationHandler.prototype.initialize = (oControl) => {
 		return Promise.resolve();
 	};
 
@@ -79,9 +79,9 @@ sap.ui.define([
 	 * @param {object} mPropertyBag A propertybag containing modification specific configuration
 	 * @param {sap.ui.core.Element} mPropertyBag.selector The according element which should be checked
 	 * @param {object} oModificationPayload An object providing a modification handler specific payload
- 	 * @returns {Promise<boolean>} reflects the modification support state
+	 * @returns {Promise<boolean>} reflects the modification support state
 	 */
-	ModificationHandler.prototype.isModificationSupported = function(mPropertyBag, oModificationPayload){
+	ModificationHandler.prototype.isModificationSupported = (mPropertyBag, oModificationPayload) => {
 		return Promise.resolve(true);
 	};
 
@@ -92,12 +92,12 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oControl The initialized control instance
 	 * @returns {Promise} Returns a <code>Promise</code> after initialization
 	 */
-	ModificationHandler.prototype.initialize = function(oControl) {
+	ModificationHandler.prototype.initialize = (oControl) => {
 		return Promise.resolve();
 	};
 
-	ModificationHandler.getInstance = function() {
-		if (!oModificationHandler){
+	ModificationHandler.getInstance = () => {
+		if (!oModificationHandler) {
 			oModificationHandler = new ModificationHandler();
 		}
 		return oModificationHandler;

package/src/sap/m/p13n/modules/AdaptationProvider.js

@@ -5,7 +5,7 @@
  */
 sap.ui.define([
 	"sap/ui/base/Object"
-], function(BaseObject) {
+], (BaseObject) => {
 	"use strict";
 
 	/**
@@ -16,12 +16,12 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @since 1.104
 	 * @private
-     *
+	 *
 	 * @ui5-restricted sap.m
 	 * @alias sap.m.p13n.modules.AdaptationProvider
 	 * @extends sap.ui.base.Object
 	 */
-	var AdaptationProvider = BaseObject.extend("sap.m.p13n.modules.AdaptationProvider");
+	const AdaptationProvider = BaseObject.extend("sap.m.p13n.modules.AdaptationProvider");
 
 	/**
 	 * Initialize adaptation for a provided control instance, set of keys and properties
@@ -32,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving in the according property helper instance
 	 */
-	AdaptationProvider.prototype.initAdaptation = function(vControl, aKeys, aCustomInfo){
+	AdaptationProvider.prototype.initAdaptation = (vControl, aKeys, aCustomInfo) => {
 		throw new Error("Please implement 'initAdaptation'");
 	};
 
@@ -44,7 +44,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving after the reset has been processed
 	 */
-	AdaptationProvider.prototype.reset = function(oControl, sKey){
+	AdaptationProvider.prototype.reset = (oControl, sKey) => {
 		throw new Error("Please implement 'reset'");
 	};
 
@@ -56,9 +56,9 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving after all changes have been processed
 	 */
-	AdaptationProvider.prototype.handleP13n = function(oControl, aKeys){
+	AdaptationProvider.prototype.handleP13n = (oControl, aKeys) => {
 		throw new Error("Please implement 'handleP13n'");
 	};
 
 	return AdaptationProvider;
-});
+});

package/src/sap/m/p13n/modules/DefaultProviderRegistry.js

@@ -7,14 +7,15 @@
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/m/p13n/PersistenceProvider",
+	"sap/ui/core/Element",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI"
-], function (BaseObject, PersistenceProvider, ControlVariantApplyAPI) {
+], (BaseObject, PersistenceProvider, Element, ControlVariantApplyAPI) => {
 	"use strict";
 
-	var ERROR_INSTANCING = "DefaultProviderRegistry: This class is a singleton and should not be used without an AdaptationProvider. Please use 'Engine.getInstance().defaultProviderRegistry' instead";
+	const ERROR_INSTANCING = "DefaultProviderRegistry: This class is a singleton and should not be used without an AdaptationProvider. Please use 'Engine.getInstance().defaultProviderRegistry' instead";
 
 	//Singleton storage
-	var oDefaultProviderRegistry;
+	let oDefaultProviderRegistry;
 
 	/**
 	 * Constructor for a new DefaultProviderRegistry.
@@ -26,13 +27,13 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @since 1.104
 	 * @alias sap.m.p13n.modules.DefaultProviderRegistry
 	 */
-	var DefaultProviderRegistry = BaseObject.extend("sap.m.p13n.modules.DefaultProviderRegistry", {
+	const DefaultProviderRegistry = BaseObject.extend("sap.m.p13n.modules.DefaultProviderRegistry", {
 		constructor: function(oEngine) {
 
 			if (oDefaultProviderRegistry) {
@@ -50,10 +51,10 @@ sap.ui.define([
 	 * @inheritDoc
 	 */
 	DefaultProviderRegistry.prototype.destroy = function() {
-		Object.keys(this._mDefaultProviders).forEach(function (sProviderName) {
+		Object.keys(this._mDefaultProviders).forEach((sProviderName) => {
 			this._mDefaultProviders[sProviderName].destroy();
 			delete this._mDefaultProviders[sProviderName];
-		}.bind(this));
+		});
 		this._oEngine = null;
 		oDefaultProviderRegistry = null;
 		BaseObject.prototype.destroy.apply(this, arguments);
@@ -69,13 +70,14 @@ sap.ui.define([
 	 * @param {sap.m.enum.PersistenceMode} sPersistenceMode Desired persistence mode for the retrieved persistence provider
 	 * @returns {sap.m.p13n.PersistenceProvider} Returns a persistence provider instance, if possible
 	 */
-	 DefaultProviderRegistry.prototype.attach = function (vElement, sPersistenceMode) {
+	DefaultProviderRegistry.prototype.attach = function(vElement, sPersistenceMode) {
 		if (this._oEngine.isRegisteredForModification(vElement)) { // Modification settings for a registered element are only determined once in the Engine
 			throw new Error("DefaultProviderRegistry: You must not change the modificationSettings for an already registered element");
 		}
 
-		var oElement = typeof vElement === "string" ? sap.ui.getCore().byId(vElement) : vElement, sElementId = typeof vElement === "string" ? vElement : vElement.getId();
-		var oDefaultProvider = this._retrieveDefaultProvider(oElement, sPersistenceMode);
+		const oElement = typeof vElement === "string" ? Element.getElementById(vElement) : vElement,
+			sElementId = typeof vElement === "string" ? vElement : vElement.getId();
+		const oDefaultProvider = this._retrieveDefaultProvider(oElement, sPersistenceMode);
 
 		if (oDefaultProvider.getFor().indexOf(sElementId) === -1) {
 			oDefaultProvider.addFor(vElement);
@@ -92,11 +94,11 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.core.Control|string} vControl The control instance or a control id.
 	 */
-	DefaultProviderRegistry.prototype.detach = function (vControl) {
-		Object.keys(this._mDefaultProviders).forEach(function (sMode) {
-			var oDefaultProvider = this._mDefaultProviders[sMode];
+	DefaultProviderRegistry.prototype.detach = function(vControl) {
+		Object.keys(this._mDefaultProviders).forEach((sMode) => {
+			const oDefaultProvider = this._mDefaultProviders[sMode];
 			oDefaultProvider.removeFor(vControl);
-		}.bind(this));
+		});
 	};
 
 	/**
@@ -108,10 +110,10 @@ sap.ui.define([
 	 * @param {sap.ui.mdc.enum.PersistenceMode} sPersistenceMode Desired persistence mode for the retrieved persistence provider
 	 * @returns {Promise} Returns a <code>Promise</code> returning a persistence provider instance, if possible
 	 */
-	 DefaultProviderRegistry.prototype._retrieveDefaultProvider = function (oElement, sPersistenceMode) {
+	DefaultProviderRegistry.prototype._retrieveDefaultProvider = function(oElement, sPersistenceMode) {
 
 		if (!this._mDefaultProviders[sPersistenceMode]) {
-			var oProvider = new PersistenceProvider("defaultProviderRegistry" + sPersistenceMode, {
+			const oProvider = new PersistenceProvider("defaultProviderRegistry" + sPersistenceMode, {
 				mode: sPersistenceMode
 			});
 			this._mDefaultProviders[sPersistenceMode] = oProvider;
@@ -126,7 +128,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.m
 	 */
-	 DefaultProviderRegistry.getInstance = function(Engine) {
+	DefaultProviderRegistry.getInstance = (Engine) => {
 		if (!oDefaultProviderRegistry) {
 			oDefaultProviderRegistry = new DefaultProviderRegistry(Engine);
 		}
@@ -134,4 +136,4 @@ sap.ui.define([
 	};
 
 	return DefaultProviderRegistry;
-});
+});