@openui5/sap.ui.rta 1.94.0 → 1.97.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -418,7 +418,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -412,10 +412,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
-	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
 Component: lit-html, version: 1.4.1
 Copyright: Google LLC
@@ -450,18 +451,21 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
+Component: SAP Theming Base Content, version: 11.1.34
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.rta",
-  "version": "1.94.0",
+  "version": "1.97.0",
   "description": "OpenUI5 UI Library sap.ui.rta",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.94.0",
-    "@openui5/sap.ui.core": "1.94.0",
-    "@openui5/sap.ui.dt": "1.94.0",
-    "@openui5/sap.ui.fl": "1.94.0",
-    "@openui5/sap.ui.layout": "1.94.0"
+    "@openui5/sap.m": "1.97.0",
+    "@openui5/sap.ui.core": "1.97.0",
+    "@openui5/sap.ui.dt": "1.97.0",
+    "@openui5/sap.ui.fl": "1.97.0",
+    "@openui5/sap.ui.layout": "1.97.0"
   }
 }

package/src/sap/ui/rta/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.94.0</version>
+  <version>1.97.0</version>
 
   <documentation>SAPUI5 library with RTA controls.</documentation>
 

package/src/sap/ui/rta/Client.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.Client
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/RuntimeAuthoring.js

@@ -33,7 +33,6 @@ sap.ui.define([
 	"sap/ui/rta/util/PopupManager",
 	"sap/ui/core/BusyIndicator",
 	"sap/ui/dt/DOMUtil",
-	"sap/ui/rta/util/StylesLoader",
 	"sap/ui/rta/appVariant/Feature",
 	"sap/ui/Device",
 	"sap/ui/rta/service/index",
@@ -47,8 +46,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/rta/util/validateFlexEnabled",
 	"sap/ui/rta/util/changeVisualization/ChangeVisualization"
-],
-function(
+], function(
 	jQuery,
 	ManagedObject,
 	FioriToolbar,
@@ -76,7 +74,6 @@ function(
 	PopupManager,
 	BusyIndicator,
 	DOMUtil,
-	StylesLoader,
 	RtaAppVariantFeature,
 	Device,
 	ServicesIndex,
@@ -107,7 +104,7 @@ function(
 	 * @class The runtime authoring allows to adapt the fields of a running application.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -119,7 +116,7 @@ function(
 			// ---- control specific ----
 			library: "sap.ui.rta",
 			associations: {
-				/** The root control which the runtime authoring should handle. Can only be sap.ui.core.Element or sap.ui.core.UIComponent */
+				/** The root control which the runtime authoring should handle. Can only be sap.ui.core.Control or sap.ui.core.UIComponent */
 				rootControl: {
 					type: "sap.ui.base.ManagedObject"
 				}
@@ -225,6 +222,7 @@ function(
 			this._dependents = {};
 			this._mServices = {};
 			this._mCustomServicesDictinary = {};
+			this._mUShellServices = {};
 
 			this.addDependent(new PluginManager(), "pluginManager");
 			this.addDependent(new PopupManager(), "popupManager");
@@ -244,6 +242,11 @@ function(
 			if (this._shouldValidateFlexEnabled()) {
 				this.attachEvent("start", validateFlexEnabled.bind(null, this));
 			}
+
+			this._loadUShellServicesPromise = FlexUtils.getUShellServices(["URLParsing", "AppLifeCycle", "CrossApplicationNavigation"])
+				.then(function (mUShellServices) {
+					this._mUShellServices = mUShellServices;
+				}.bind(this));
 		},
 		_RELOAD: {
 			NOT_NEEDED: "NO_RELOAD",
@@ -411,6 +414,15 @@ function(
 		}).then(this._setVersionsModel.bind(this));
 	};
 
+	function addOrRemoveStyleClass(oRootControl, bAdd) {
+		if (oRootControl.isA("sap.ui.core.UIComponent")) {
+			oRootControl = oRootControl.getRootControl();
+		}
+		if (oRootControl) {
+			oRootControl[bAdd ? "addStyleClass" : "removeStyleClass"]("sapUiRtaRoot");
+		}
+	}
+
 	/**
 	 * Start UI adaptation at runtime (RTA).
 	 * @return {Promise} Returns a Promise with the initialization of RTA
@@ -429,7 +441,8 @@ function(
 				return Promise.reject(vError);
 			}
 
-			return this._initVersioning()
+			return this._loadUShellServicesPromise
+			.then(this._initVersioning.bind(this))
 			/*
 			Check if the application has personalized changes and reload without them;
 			Also Check if the application has an available draft and if yes, reload with those changes.
@@ -495,15 +508,9 @@ function(
 			// this is needed to initially check if undo is available, e.g. when the stack gets initialized with changes
 			.then(this._onStackModified.bind(this))
 			.then(function () {
-				// non-blocking style loading
-				StylesLoader
-				.loadStyles("InPageStyles")
-				.then(function (sData) {
-					var sStyles = sData.replace(/%scrollWidth%/g, DOMUtil.getScrollbarWidth() + "px");
-					DOMUtil.insertStyles(sStyles, Overlay.getOverlayContainer().get(0));
-				});
-			})
-			.then(function () {
+				//Resolve the CSS variable set in themes/base/OverlayWithScrollbar.css
+				Overlay.getOverlayContainer().get(0).style.setProperty("--sap-ui-rta-scrollbar-scrollWidth", DOMUtil.getScrollbarWidth() + "px");
+				Overlay.getOverlayContainer().get(0).style.setProperty("--sap-ui-rta-scrollbar-scrollWidthPlusTwo", DOMUtil.getScrollbarWidth() + 2 + "px");
 				return oDesignTimePromise;
 			})
 			.then(function () {
@@ -527,11 +534,7 @@ function(
 				this.fnKeyDown = this._onKeyDown.bind(this);
 				jQuery(document).on("keydown", this.fnKeyDown);
 
-				var oRootOverlay = OverlayRegistry.getOverlay(this.getRootControl());
-				this._$RootControl = oRootOverlay.getAssociatedDomRef();
-				if (this._$RootControl) {
-					this._$RootControl.addClass("sapUiRtaRoot");
-				}
+				addOrRemoveStyleClass(this.getRootControlInstance(), true);
 			}.bind(this))
 			.then(function () {
 				this._sStatus = STARTED;
@@ -646,6 +649,7 @@ function(
 
 	/**
 	 * adapt the enablement of undo/redo/reset/transport button
+	 * @returns {Promise} Resolves as soon as the MessageBox is closed
 	 * @private
 	 */
 	RuntimeAuthoring.prototype._onStackModified = function() {
@@ -907,7 +911,7 @@ function(
 		}
 		var bTriggerReload = true;
 		this.getCommandStack().removeAllCommands();
-		var mParsedHash = this._removeVersionParameterForFLP(oReloadInfo, FlexUtils.getParsedURLHash(), bTriggerReload);
+		var mParsedHash = this._removeVersionParameterForFLP(oReloadInfo, FlexUtils.getParsedURLHash(this._getUShellService("URLParsing")), bTriggerReload);
 		this._triggerCrossAppNavigation(mParsedHash);
 		return this.stop(true, true);
 	};
@@ -926,6 +930,7 @@ function(
 				})
 				.then(this._handleDiscard.bind(this));
 			}
+			return undefined;
 		}.bind(this));
 	};
 
@@ -940,23 +945,23 @@ function(
 
 		if (this.canUndo()) {
 			this._nSwitchToVersion = nVersion;
-			return Utils.showMessageBox("warning", "MSG_SWITCH_VERSION_DIALOG", {
+			Utils.showMessageBox("warning", "MSG_SWITCH_VERSION_DIALOG", {
 				titleKey: "TIT_SWITCH_VERSION_DIALOG",
 				actions: [MessageBox.Action.YES, MessageBox.Action.NO, MessageBox.Action.CANCEL],
 				emphasizedAction: MessageBox.Action.YES
 			}).then(function (sAction) {
-				switch (sAction) {
-					case MessageBox.Action.YES:
-						return this._serializeToLrep(this)
-							.then(this._switchVersion.bind(this, this._nSwitchToVersion));
-					case MessageBox.Action.NO:
-						// avoids the data loss popup; a reload is triggered later and will destroy RTA & the command stack
-						this.getCommandStack().removeAllCommands(true);
-						this._switchVersion(this._nSwitchToVersion);
+				if (sAction === MessageBox.Action.YES) {
+					this._serializeToLrep(this)
+						.then(this._switchVersion.bind(this, this._nSwitchToVersion));
+				} else if (sAction === MessageBox.Action.NO) {
+					// avoids the data loss popup; a reload is triggered later and will destroy RTA & the command stack
+					this.getCommandStack().removeAllCommands(true);
+					this._switchVersion(this._nSwitchToVersion);
 				}
+				return undefined;
 			}.bind(this));
+			return;
 		}
-
 		this._switchVersion(nVersion);
 	};
 
@@ -966,7 +971,7 @@ function(
 		RuntimeAuthoring.enableRestart(this.getLayer(), this.getRootControlInstance());
 
 		if (!FlexUtils.getUshellContainer()) {
-			if (!ReloadInfoAPI.hasVersionParameterWithValue({value: sVersion})) {
+			if (!ReloadInfoAPI.hasVersionParameterWithValue({value: sVersion}, this._getUShellService("URLParsing"))) {
 				var oReloadInfo = {
 					versionSwitch: true,
 					version: sVersion
@@ -975,20 +980,25 @@ function(
 			}
 			return this._reloadPage();
 		}
-		var mParsedHash = FlexUtils.getParsedURLHash();
+		var mParsedHash = FlexUtils.getParsedURLHash(this._getUShellService("URLParsing"));
 		VersionsAPI.loadVersionForApplication({
 			selector: this.getRootControlInstance(),
 			layer: this.getLayer(),
 			version: nVersion
 		});
 		var aVersionsParameter = mParsedHash.params[sap.ui.fl.Versions.UrlParameter];
-		if (aVersionsParameter && aVersionsParameter[0] === sVersion) {
+		if (
+			aVersionsParameter &&
+			aVersionsParameter[0] === sVersion &&
+			this._getUShellService("AppLifeCycle")
+		) {
 			// RTA was started with a version parameter, the displayed version has changed and the key user switches back
-			FlexUtils.getUshellContainer().getService("AppLifeCycle").reloadCurrentApp();
+			this._getUShellService("AppLifeCycle").reloadCurrentApp();
 		} else {
 			mParsedHash.params[sap.ui.fl.Versions.UrlParameter] = sVersion;
 			this._triggerCrossAppNavigation(mParsedHash);
 		}
+		return undefined;
 	};
 
 	RuntimeAuthoring.prototype._setUriParameter = function (sParameters) {
@@ -1017,8 +1027,8 @@ function(
 				oProperties.activate = this._onActivate.bind(this);
 				oProperties.discardDraft = this._onDiscardDraft.bind(this);
 				oProperties.switchVersion = this._onSwitchVersion.bind(this);
-				oProperties.toggleChangeVisualizationPopover = this.getChangeVisualization
-					? this.getChangeVisualization().togglePopover.bind(this.getChangeVisualization())
+				oProperties.onCommandCategorySelection = this.getChangeVisualization
+					? this.getChangeVisualization().onCommandCategorySelection.bind(this.getChangeVisualization())
 					: function () {};
 			}
 
@@ -1100,8 +1110,8 @@ function(
 			jQuery(document).off("keydown", this.fnKeyDown);
 		}
 
-		if (this._$RootControl) {
-			this._$RootControl.removeClass("sapUiRtaRoot");
+		if (this.getRootControlInstance()) {
+			addOrRemoveStyleClass(this.getRootControlInstance(), false);
 		}
 
 		this.setCommandStack(null);
@@ -1169,7 +1179,7 @@ function(
 	 * the changes for both places will be deleted. For App Variants all the changes are saved in one place.
 	 *
 	 * @private
-	 * @returns {Promise}
+	 * @returns {Promise} Resolves when change persistence is resetted
 	 */
 	RuntimeAuthoring.prototype._deleteChanges = function() {
 		var sLayer = this.getLayer();
@@ -1180,7 +1190,7 @@ function(
 		}).then(function () {
 			ReloadInfoAPI.removeInfoSessionStorage(oSelector);
 			var oReloadInfo = {
-				isDraftAvailable: ReloadInfoAPI.hasVersionParameterWithValue({value: sLayer}),
+				isDraftAvailable: ReloadInfoAPI.hasVersionParameterWithValue({value: sLayer}, this._getUShellService("URLParsing")),
 				layer: sLayer,
 				deleteMaxLayer: false,
 				triggerHardReload: true
@@ -1261,25 +1271,28 @@ function(
 	 */
 	RuntimeAuthoring.prototype._onRestore = function() {
 		var sLayer = this.getLayer();
-		var sMessage = sLayer === Layer.USER
-			? this._getTextResources().getText("FORM_PERS_RESET_MESSAGE_PERSONALIZATION")
-			: this._getTextResources().getText("FORM_PERS_RESET_MESSAGE");
-		var sTitle = sLayer === Layer.USER
-			? this._getTextResources().getText("BTN_RESTORE")
-			: this._getTextResources().getText("FORM_PERS_RESET_TITLE");
+		var sMessageKey = sLayer === Layer.USER
+			? "FORM_PERS_RESET_MESSAGE_PERSONALIZATION"
+			: "FORM_PERS_RESET_MESSAGE";
+		var sTitleKey = sLayer === Layer.USER
+			? "BTN_RESTORE"
+			: "FORM_PERS_RESET_TITLE";
 
 		this.getPluginManager().handleStopCutPaste();
 
-		return Utils.showMessageBox("warning", sMessage, {
-			titleKey: sTitle,
+		return Utils.showMessageBox("warning", sMessageKey, {
+			titleKey: sTitleKey,
 			actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
 			emphasizedAction: MessageBox.Action.OK
 		}).then(function(sAction) {
 			if (sAction === MessageBox.Action.OK) {
 				RuntimeAuthoring.enableRestart(sLayer, this.getRootControlInstance());
-				this._deleteChanges();
-				this.getCommandStack().removeAllCommands();
+				return this._deleteChanges()
+					.then(function () {
+						this.getCommandStack().removeAllCommands();
+					}.bind(this));
 			}
+			return undefined;
 		}.bind(this));
 	};
 
@@ -1420,12 +1433,15 @@ function(
 	};
 
 	RuntimeAuthoring.prototype._triggerCrossAppNavigation = function(mParsedHash) {
-		if (this.getLayer() !== Layer.USER) {
-			return FlexUtils.ifUShellContainerThen(function(aServices) {
-				aServices[0].toExternal(this._buildNavigationArguments(mParsedHash));
-				return Promise.resolve(true);
-			}.bind(this), ["CrossApplicationNavigation"]);
+		if (
+			(this.getLayer() !== Layer.USER) &&
+			this._getUShellService("CrossApplicationNavigation")
+		) {
+			this._getUShellService("CrossApplicationNavigation")
+				.toExternal(this._buildNavigationArguments(mParsedHash));
+			return true;
 		}
+		return false;
 	};
 
 	RuntimeAuthoring.prototype._removeVersionParameterForFLP = function(oReloadInfo, mParsedHash, bTriggerReload) {
@@ -1434,13 +1450,16 @@ function(
 			return mParsedHash;
 		}
 
-		var sVersionParameter = FlexUtils.getParameter(flexLibrary.Versions.UrlParameter);
+		var sVersionParameter = FlexUtils.getParameter(flexLibrary.Versions.UrlParameter, this._getUShellService("URLParsing"));
 		if (sVersionParameter) {
 			delete mParsedHash.params[flexLibrary.Versions.UrlParameter];
-		} else if ((this._isDraftAvailable() || bTriggerReload /* for discarding of dirty changes */)
-			&& !oReloadInfo.hasHigherLayerChanges) {
+		} else if (
+			(this._isDraftAvailable() || bTriggerReload /* for discarding of dirty changes */) &&
+			!oReloadInfo.hasHigherLayerChanges &&
+			this._getUShellService("AppLifeCycle")
+		) {
 			// reloading this way only works when we dont have to remove max-layer parameter, see _removeMaxLayerParameterForFLP
-			FlexUtils.getUshellContainer().getService("AppLifeCycle").reloadCurrentApp();
+			this._getUShellService("AppLifeCycle").reloadCurrentApp();
 		}
 		return mParsedHash;
 	};
@@ -1468,14 +1487,18 @@ function(
 			return this._triggerHardReload(oReloadInfo);
 		}
 
-		var mParsedHash = FlexUtils.getParsedURLHash();
+		var mParsedHash = FlexUtils.getParsedURLHash(this._getUShellService("URLParsing"));
 		if (!mParsedHash) {
-			return;
+			return undefined;
 		}
 
 		// allContexts do not change the url parameter to trigger a reload
-		if (oReloadInfo.allContexts && !oReloadInfo.hasHigherLayerChanges) {
-			FlexUtils.getUshellContainer().getService("AppLifeCycle").reloadCurrentApp();
+		if (
+			oReloadInfo.allContexts &&
+			!oReloadInfo.hasHigherLayerChanges &&
+			this._getUShellService("AppLifeCycle")
+		) {
+			this._getUShellService("AppLifeCycle").reloadCurrentApp();
 		}
 
 		mParsedHash = this._removeMaxLayerParameterForFLP(oReloadInfo, mParsedHash);
@@ -1582,7 +1605,7 @@ function(
 	};
 
 	RuntimeAuthoring.prototype._triggerReloadOnStart = function(oReloadInfo) {
-		FlexUtils.ifUShellContainerThen(function() {
+		if (this._getUShellService("CrossApplicationNavigation")) {
 			if (oReloadInfo.isDraftAvailable) {
 				// clears FlexState and triggers reloading of the flex data without blocking
 				VersionsAPI.loadDraftForApplication({
@@ -1596,7 +1619,7 @@ function(
 					allContexts: oReloadInfo.allContexts
 				});
 			}
-		}, ["CrossApplicationNavigation"]);
+		}
 		var sReason = this._getReloadMessageOnStart(oReloadInfo);
 		if (!sReason) {
 			return Promise.resolve();
@@ -1605,8 +1628,12 @@ function(
 		.then(function() {
 			RuntimeAuthoring.enableRestart(oReloadInfo.layer, this.getRootControlInstance());
 			// allContexts do not change the url parameter to trigger a reload
-			if (oReloadInfo.allContexts && !oReloadInfo.hasHigherLayerChanges) {
-				FlexUtils.getUshellContainer().getService("AppLifeCycle").reloadCurrentApp();
+			if (
+				oReloadInfo.allContexts &&
+				!oReloadInfo.hasHigherLayerChanges &&
+				this._getUShellService("AppLifeCycle")
+			) {
+				this._getUShellService("AppLifeCycle").reloadCurrentApp();
 			}
 			if (FlexUtils.getUshellContainer()) {
 				// clears FlexState and triggers reloading of the flex data without blocking
@@ -1632,7 +1659,8 @@ function(
 			layer: this.getLayer(),
 			selector: this.getRootControlInstance(),
 			ignoreMaxLayerParameter: false,
-			includeCtrlVariants: true
+			includeCtrlVariants: true,
+			URLParsingService: this._getUShellService("URLParsing")
 		};
 		return ReloadInfoAPI.getReloadReasonsForStart(oReloadInfo)
 		.then(function (oReloadInfo) {
@@ -1642,6 +1670,7 @@ function(
 			if (oReloadInfo.hasHigherLayerChanges || oReloadInfo.isDraftAvailable || oReloadInfo.allContexts) {
 				return this._triggerReloadOnStart(oReloadInfo);
 			}
+			return undefined;
 		}.bind(this));
 	};
 
@@ -1650,10 +1679,11 @@ function(
 	 * This function must only be called outside of the ushell.
 	 *
 	 * @param {Object} oReloadInfo - Information to determine reload is needed
-	 * @returns {Promise}
+	 * @returns {Promise} Resolves when page reload is triggered
 	 */
 	RuntimeAuthoring.prototype._triggerHardReload = function(oReloadInfo) {
 		oReloadInfo.parameters = document.location.search;
+		oReloadInfo.URLParsingService = this._getUShellService("URLParsing");
 		var sParameters = ReloadInfoAPI.handleUrlParametersForStandalone(oReloadInfo);
 		if (document.location.search !== sParameters) {
 			this._setUriParameter(sParameters);
@@ -1682,7 +1712,8 @@ function(
 				changesNeedReload: bChangesNeedReload,
 				isDraftAvailable: this._oVersionsModel.getProperty("/draftAvailable"),
 				versioningEnabled: this._oVersionsModel.getProperty("/versioningEnabled"),
-				activeVersion: this._oVersionsModel.getProperty("/activeVersion")
+				activeVersion: this._oVersionsModel.getProperty("/activeVersion"),
+				URLParsingService: this._getUShellService("URLParsing")
 			};
 			oReloadInfo = ReloadInfoAPI.getReloadMethod(oReloadInfo);
 			return this._handleReloadMessageBoxOnExit(oReloadInfo).then(function () {
@@ -1704,7 +1735,7 @@ function(
 		if (sCurrentMode !== sNewMode) {
 			var oChangeVisualization = this.getChangeVisualization && this.getChangeVisualization();
 			if (sNewMode === "visualization" || sCurrentMode === "visualization") {
-				oChangeVisualization.triggerModeChange(this.getRootControl());
+				oChangeVisualization.triggerModeChange(this.getRootControl(), this.getToolbar());
 			}
 			var oTabHandlingPlugin = this.getPluginManager().getPlugin("tabHandling");
 			var oSelectionPlugin = this.getPluginManager().getPlugin("selection");
@@ -1940,5 +1971,9 @@ function(
 		return this.startService(sName);
 	};
 
+	RuntimeAuthoring.prototype._getUShellService = function(sServiceName) {
+		return FlexUtils.getUshellContainer() && this._mUShellServices[sServiceName];
+	};
+
 	return RuntimeAuthoring;
 });