@sapui5/sap.ushell 1.117.1 → 1.118.0

package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -38,7 +38,6 @@ sap.ui.define([
     "sap/base/util/extend",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/ApplicationType",
-    "sap/ushell/Config",
     "sap/ushell/navigationMode",
     "sap/ushell/services/_ClientSideTargetResolution/Formatter",
     "sap/ushell/services/_ClientSideTargetResolution/InboundIndex",
@@ -51,7 +50,6 @@ sap.ui.define([
     "sap/ushell/services/_ClientSideTargetResolution/Utils",
     "sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds",
     "sap/ushell/services/_ClientSideTargetResolution/XAppStateProcessing",
-    "sap/ushell/services/AppConfiguration",
     "sap/ushell/TechnicalParameters",
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing"
@@ -59,10 +57,9 @@ sap.ui.define([
     Log,
     fnIsPlainObject,
     ObjectPath,
-    Extend,
+    fnExtend,
     jQuery,
     ApplicationType,
-    Config,
     NavigationMode,
     _Formatter,
     _InboundIndex,
@@ -75,7 +72,6 @@ sap.ui.define([
     _Utils,
     _VirtualInbounds,
     _XAppStateProcessing,
-    AppConfiguration,
     TechnicalParameters,
     UshellUtils,
     UrlParsing
@@ -162,7 +158,7 @@ sap.ui.define([
      * Checks whether the platform adapter has a compatible service interface.
      *
      * @param {object} oAdapter An instance of ClientSideTargetResolution Adapter for the platform at hand.
-     * @return {boolean} Whether the adapter implements the ClientSideTargetResolution required interface.
+     * @returns {boolean} Whether the adapter implements the ClientSideTargetResolution required interface.
      */
     ClientSideTargetResolution.prototype._implementsServiceInterface = function (oAdapter) {
         if (typeof oAdapter.getInbounds === "function") {
@@ -244,7 +240,7 @@ sap.ui.define([
      * Resolves a given intent to information that can be used to render a tile.
      *
      * @param {string} sHashFragment The intent to be resolved (including the "#" sign).
-     * @return {jQuery.Deferred.promise} Resolves with an object containing the necessary information to render a tile,
+     * @returns {jQuery.Deferred.promise} Resolves with an object containing the necessary information to render a tile,
      *   or rejects with an error message or <code>undefined</code>.
      * @private
      * @since 1.38.0
@@ -350,9 +346,7 @@ sap.ui.define([
                 }
 
                 that._resolveSingleMatchingTarget(oMatchingTarget, fnBoundFallback, sFixedHashFragment)
-                    .done(function (o) {
-                        oDeferred.resolve(o);
-                    })
+                    .done(oDeferred.resolve.bind(oDeferred))
                     .fail(oDeferred.reject.bind(oDeferred));
             });
 
@@ -402,25 +396,22 @@ sap.ui.define([
         var bHasUrlTemplate = !!oMatchingTarget.inbound.templateContext;
         var fnEasyAccessMenuResolver = ApplicationType.getEasyAccessMenuResolver(sIntent, sApplicationType);
         if (fnEasyAccessMenuResolver && !bHasUrlTemplate) {
-            fnEasyAccessMenuResolver(oIntent, oMatchingTarget, fnExternalSystemAliasResolver, ApplicationType.WDA.enableWdaCompatibilityMode).then(
-                function (oResolutionResult) {
-                    // compute NavigationMode
-                    var oNavModeProperties = NavigationMode.compute(
-                        ObjectPath.get("inbound.resolutionResult.applicationType", oMatchingTarget),
-                        (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0],
-                        (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
-                        (AppConfiguration.getCurrentApplication() || {}).applicationType,
-                        Config.last("/core/navigation/enableInPlaceForClassicUIs")
-                    );
-
-                    UshellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
-                    oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
-                    oDeferred.resolve(oResolutionResult);
-                },
-                function (sError) {
-                    oDeferred.reject(sError);
-                }
-            );
+            fnEasyAccessMenuResolver(oIntent, oMatchingTarget, fnExternalSystemAliasResolver, ApplicationType.WDA.enableWdaCompatibilityMode)
+                .then(
+                    function (oResolutionResult) {
+                        var oNavModeProperties = NavigationMode.getNavigationMode(
+                            oResolutionResult,
+                            (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
+                            (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
+                        );
+                        UshellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
+                        oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
+                        oDeferred.resolve(oResolutionResult);
+                    },
+                    function (sError) {
+                        oDeferred.reject(sError);
+                    }
+                );
             return oDeferred.promise();
         }
 
@@ -430,43 +421,46 @@ sap.ui.define([
         _ParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
         sap.ushell.Container.getServiceAsync("AppState").then(function (AppStateService) {
             _XAppStateProcessing.mixAppStateIntoResolutionResultAndRename(oMatchingTarget, AppStateService)
-            .done(function (oMatchingTarget) {
-                var fnResultProcessor = function () {
-                    return that._constructFallbackResolutionResult.call(that, oMatchingTarget, fnBoundFallback, sFixedHashFragment);
-                };
-                if (ApplicationType[sApplicationType]) {
-                    fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
-                }
+                .done(function (oMatchingTarget) {
+                    var fnResultProcessor = function () {
+                        return that._constructFallbackResolutionResult(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
+                    };
+                    if (ApplicationType[sApplicationType]) {
+                        fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
+                    }
 
-                // remove parameters that should not make it to the URL (in any case!)
-                delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
-                delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
-                oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
-                    return sParameterName !== "sap-tag";
-                });
+                    // remove parameters that should not make it to the URL (in any case!)
+                    delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
+                    delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
+                    oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
+                        return sParameterName !== "sap-tag";
+                    });
 
-                var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
+                    var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
 
-                _PrelaunchOperations.executePrelaunchOperations(oMatchingTarget, oReservedParameters["sap-prelaunch-operations"])
-                    .then(function () {
-                        return fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
-                    })
-                    .then(function (oResolutionResult) {
-                        oResolutionResult.reservedParameters = oReservedParameters;
-                        oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
-                        return oResolutionResult;
-                    })
-                    .then(
-                        function (oResolutionResult) {
+                    _PrelaunchOperations.executePrelaunchOperations(oMatchingTarget, oReservedParameters["sap-prelaunch-operations"])
+                        .then(function () {
+                            return fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver);
+                        })
+                        .then(function (oResolutionResult) {
+
+                            var oNavModeProperties = NavigationMode.getNavigationMode(
+                                oResolutionResult,
+                                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
+                                (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
+                            );
+                            UshellUtils.shallowMergeObject(oResolutionResult, oNavModeProperties);
+
+                            oResolutionResult.reservedParameters = oReservedParameters;
+                            oResolutionResult.inboundPermanentKey = oMatchingTarget.inbound.permanentKey || oMatchingTarget.inbound.id;
                             Log.debug(
                                 "Intent was resolved to the following target",
-                                JSON.stringify(oMatchingTarget.resolutionResult, null, 3),
+                                JSON.stringify(oResolutionResult, null, 3),
                                 "sap.ushell.services.ClientSideTargetResolution"
                             );
                             UshellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
                             oDeferred.resolve(oMatchingTarget.resolutionResult);
-                        },
-                        function (vMessage) {
+                        }, function (vMessage) {
                             if (typeof vMessage === "string" && vMessage.indexOf("fallback:") >= 0) {
                                 that._constructFallbackResolutionResult.call(this, oMatchingTarget, fnBoundFallback, sFixedHashFragment)
                                     .then(
@@ -479,14 +473,13 @@ sap.ui.define([
                             } else {
                                 oDeferred.reject(vMessage);
                             }
-                        }
-                    );
-            });
+                        });
+                });
         });
         return oDeferred.promise();
     };
 
-    /**
+    /**‚
      * Takes the parameters from startup parameters and inbound parameters.
      * For startup parameters, an array of parameter names is returned.
      * For inbound parameters, it is taken from inbound signature.
@@ -598,47 +591,50 @@ sap.ui.define([
         _ParameterMapping.mapParameterNamesAndRemoveObjects(oMatchingTarget);
         sap.ushell.Container.getServiceAsync("AppState").then(function (AppStateService) {
             _XAppStateProcessing.mixAppStateIntoResolutionResultAndRename(oMatchingTarget, AppStateService)
-            .done(function (oMatchingTarget) {
-                var fnResultProcessor = function () {
-                    return that._constructFallbackResolutionResult.call(that, oMatchingTarget, fnBoundFallback, sFixedHashFragment);
-                };
-                if (ApplicationType[sApplicationType]) {
-                    fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
-                }
+                .done(function (oMatchingTarget) {
+                    var fnResultProcessor = function () {
+                        return that._constructFallbackResolutionResult(oMatchingTarget, fnBoundFallback, sFixedHashFragment);
+                    };
+                    if (ApplicationType[sApplicationType]) {
+                        fnResultProcessor = ApplicationType[sApplicationType].generateResolutionResult;
+                    }
 
-                // remove parameters that should not make it to the URL (in any case!)
-                delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
-                delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
-                oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
-                    return sParameterName !== "sap-tag";
-                });
+                    // remove parameters that should not make it to the URL (in any case!)
+                    delete oMatchingTarget.intentParamsPlusAllDefaults["sap-tag"];
+                    delete oMatchingTarget.mappedIntentParamsPlusSimpleDefaults["sap-tag"];
+                    oMatchingTarget.mappedDefaultedParamNames = oMatchingTarget.mappedDefaultedParamNames.filter(function (sParameterName) {
+                        return sParameterName !== "sap-tag";
+                    });
 
-                var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
+                    var sBaseUrl = ObjectPath.get("inbound.resolutionResult.url", oMatchingTarget);
 
-                fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver).then(
-                    function (oResolutionResult) {
-                        UshellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
+                    fnResultProcessor(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver)
+                        .then(function (oResolutionResult) {
+                                UshellUtils.shallowMergeObject(oMatchingTarget.resolutionResult, oResolutionResult);
 
-                        // beware, shallow copy of central object! only modify root properties!
-                        var oTileResolutionResult = Extend({}, oMatchingTarget.inbound.tileResolutionResult);
+                                // beware, shallow copy of central object! only modify root properties!
+                                var oTileResolutionResult = fnExtend({}, oMatchingTarget.inbound.tileResolutionResult);
 
-                        oTileResolutionResult.startupParameters = oMatchingTarget.effectiveParameters;
-                        oTileResolutionResult.navigationMode = oMatchingTarget.resolutionResult.navigationMode;
-                        if (!oTileResolutionResult.navigationMode) {
-                            oTileResolutionResult.navigationMode = NavigationMode.getNavigationMode(oMatchingTarget.resolutionResult);
-                        }
-                        oDeferred.resolve(oTileResolutionResult);
-                        Log.debug(
-                            "Tile Intent was resolved to the following target",
-                            JSON.stringify(oTileResolutionResult, null, 3),
-                            "sap.ushell.services.ClientSideTargetResolution"
+                                oTileResolutionResult.startupParameters = oMatchingTarget.effectiveParameters;
+
+                                var oNavModeProperties = NavigationMode.getNavigationMode(
+                                    oResolutionResult,
+                                    (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-navmode"] || [])[0],
+                                    (oMatchingTarget.intentParamsPlusAllDefaults["sap-ushell-next-navmode"] || [])[0]
+                                );
+                                UshellUtils.shallowMergeObject(oTileResolutionResult, oNavModeProperties);
+
+                                oDeferred.resolve(oTileResolutionResult);
+                                Log.debug(
+                                    "Tile Intent was resolved to the following target",
+                                    JSON.stringify(oTileResolutionResult, null, 3),
+                                    "sap.ushell.services.ClientSideTargetResolution"
+                                );
+                            }, function (sMessage) {
+                                oDeferred.reject(sMessage);
+                            }
                         );
-                    },
-                    function (sMessage) {
-                        oDeferred.reject(sMessage);
-                    }
-                );
-            });
+                });
         });
         return oDeferred.promise();
     };
@@ -721,7 +717,7 @@ sap.ui.define([
         return new Promise(function (fnResolve, fnReject) {
             fnBoundFallback(
                 sFixedHashFragment,
-                Extend({}, oMatchingTarget.inbound), // don't let adapters to change the inbound member
+                fnExtend({}, oMatchingTarget.inbound), // don't let adapters to change the inbound member
                 oEffectiveParameters
             )
                 .done(function (oFallbackResolutionResult) {
@@ -828,7 +824,7 @@ sap.ui.define([
 
         if (arguments.length === 1 && fnIsPlainObject(arguments[0])) {
             oNominalArgs = arguments[0];
-            oCallArgs = Extend({}, oNominalArgs);
+            oCallArgs = fnExtend({}, oNominalArgs);
             // assure action: undefined in transported, as there is a check on this below !?!
             ["action", "semanticObject"].forEach(function (sArg) {
                 if (oNominalArgs.hasOwnProperty(sArg)) {
@@ -1608,8 +1604,8 @@ sap.ui.define([
         /**
          * Sets the result for the given intent as indicated.
          *
-         * @param {string} sIntent
-         * @param {boolean} bSupported
+         * @param {string} sIntent Intent string
+         * @param {boolean} bSupported Supported flag
          */
         function setResult (sIntent, bSupported) {
             mSupportedByIntent[sIntent] = {

package/src/main/js/sap/ushell/services/CommonDataModel.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Exposes a CommonDataModel based site document in a platform neutral format to it's clients
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/services/_CommonDataModel/PersonalizationProcessor",

package/src/main/js/sap/ushell/services/Configuration.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's Configuration service enables Components of any kind to consume parts of Configuration
  * provided by the shell. It allows to attach on updates and receive the current values
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/ConfigurationDefaults.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Configuration Defaults service exposes default configurations set in the code base.
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ContentExtensionAdapterFactory.js

@@ -4,7 +4,7 @@
  * default adapter.
  * Once instantiated, returns a map of adapters to be used by the LaunchPage Service
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/CrossApplicationNavigation.js

@@ -5,7 +5,7 @@
  * This file exposes an API to perform (invoke) Cross Application Navigation for applications.
  * It exposes interfaces to perform a hash change and/or trigger an external navigation.
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/services/AppConfiguration",

package/src/main/js/sap/ushell/services/DarkModeSupport.js

@@ -5,7 +5,7 @@
  *
  * The service provide dark mode support functionality
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/LaunchPage.js

@@ -2,7 +2,7 @@
 
 /**
  * @file The Unified Shell's page builder service providing the data for the Fiori launchpad's classic Homepage.
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Menu.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The menu service provides the entries for the menu bar
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/Message.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's message service.
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/MessageBroker.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes API enpoints for Generic Communication
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/services/_MessageBroker/MessageBrokerEngine",

package/src/main/js/sap/ushell/services/NavTargetResolution.js

@@ -21,7 +21,7 @@ sap.ui.define([
     UrlParsing,
     UrlShortening,
     HttpClient,
-    oNavigationMode,
+    NavigationMode,
     jQuery,
     Measurement,
     deepExtend,
@@ -119,7 +119,7 @@ sap.ui.define([
          * and fixes any "SAPUI5" applicationType returned in the response to "URL", to avoid backward compatibility problems.
          *
          * @param {string} sFragmentNoHash the hash fragment to resolve
-         * @return {jQuery.Promise} A jQuery Promise that resolves to an object representing the resolution result
+         * @returns {jQuery.Promise} A jQuery Promise that resolves to an object representing the resolution result
          * @private
          * @since 1.34.0
          */
@@ -149,7 +149,7 @@ sap.ui.define([
          * NOTE: throws a {@link sap.ushell.utils#Error} in case the given hash fragment does not start with "#".
          *
          * @param {string} sHashFragment the hash fragment to be validated
-         * @return {object} the validation result. An object like:
+         * @returns {object} the validation result. An object like:
          *   <pre>
          *   {
          *     success: {boolean},               // whether the hash fragment looks valid
@@ -231,22 +231,6 @@ sap.ui.define([
 
         var aWDAGUIAppType = ["NWBC", "WDA", "TR"];
 
-        /**
-         * Returns the navigation mode of a given resolved hash fragment
-         *
-         * @param {object} oResolvedHashFragment the hash fragment resolved by one of the registered resolvers
-         * @param {object} [oCurrentlyOpenedApp] an object describing the currently opened app
-         * @returns {string} the navigation mode for the given hash fragment.
-         *   Returns the following values, each corresponding to a specific way the application should be navigated to:
-         *     <ul>
-         *       <li><code>"embedded"</code>: the application should be opened in the current window, and rendered within the launchpad shell.</li>
-         *       <li><code>"newWindow"</code>: the application should be rendered in a new window, but no launchpad header must be present.</li>
-         *       <li><code>"newWindowThenEmbedded"</code>: the application should be opened in a new window but rendered within the launchpad shell.</li>
-         *       <li><code>undefined</code>: it was not possible to determine a navigation mode for the app. An error should be displayed in this case.</li>
-         *     </ul>
-         * @private
-         */
-
         /**
          * Adjusts the applicationType &quot;SAPUI5&quot; to &quot;URL&quot; and extracts the component name from a resolution result and
          * sets it as separate property <code>ui5ComponentName</code> in the specified object.
@@ -419,6 +403,7 @@ sap.ui.define([
          *   </p>
          *   <p>No navigation should occur when the promise is resolved to <code>undefined</code>.</p>
          * @public
+         *
          * @alias sap.ushell.services.NavTargetResolution#resolveHashFragment
          */
         this.resolveHashFragment = function (sHashFragment) {
@@ -465,14 +450,7 @@ sap.ui.define([
 
                             // Add navigation mode if it's not already there
                             if (isPlainObject(oResult)) {
-                                if (!oResult.hasOwnProperty("navigationMode")) {
-                                    oResult.navigationMode = oNavigationMode.getNavigationMode(
-                                        oResult,
-                                        appConfiguration.getCurrentApplication()
-                                    );
-                                }
-
-                                oResult.targetNavigationMode = oNavigationMode.getExternalNavigationMode(
+                                oResult.targetNavigationMode = NavigationMode.getExternalNavigationMode(
                                     oResult.navigationMode
                                 );
                             }
@@ -509,7 +487,7 @@ sap.ui.define([
 
         /**
          * Returns the method that allows to return results for the getLinks method along with meta information to handle the method call.
-         *
+         * @param {object} oArgs argument object
          * @returns {object} an object like:
          *   <pre>
          *   {
@@ -740,7 +718,7 @@ sap.ui.define([
 
             // Use the adapter if it implements this functionality
             if (oAdapter && oAdapter.getDistinctSemanticObjects) {
-                return oAdapter.getDistinctSemanticObjects.call(oAdapter);
+                return oAdapter.getDistinctSemanticObjects();
             }
 
             Log.error(
@@ -1006,7 +984,7 @@ sap.ui.define([
          * @param {string} sFunctionName The name of the function called.
          * @param {object} oParameters The input parameters of the function.
          * @param {object|array} vResult The output result of the function.
-         * @return {object|array} The output result for further processing.
+         * @returns {object|array} The output result for further processing.
          * @private
          */
         this._recordNavigation = function (sFunctionName, oParameters, vResult) {
@@ -1034,7 +1012,7 @@ sap.ui.define([
          * The resolver must be JavaScript object with a string property name, and two functions
          * resolveHashFragment(sHashFragment,nextResolver) returning a promise and isApplicable(sHashFragment) returning a boolean
          *
-         * @param {Object} oResolver the custom resolver
+         * @param {object} oResolver the custom resolver
          * @returns {boolean} true if resolver was registered, false otherwise
          */
         this.registerCustomResolver = function (oResolver) {
@@ -1166,8 +1144,8 @@ sap.ui.define([
                     "#Test-config": {
                         applicationType: "URL",
                         url: "/sap/bc/ui5_ui5/ui2/ushell/test-resources/sap/ushell/demoapps/FioriSandboxConfigApp",
-                        additionalInformation: //"SAPUI5.Component=AppNavSample"
-                            "SAPUI5.Component=sap.ushell.demoapps.FioriSandboxConfigApp"
+                        additionalInformation: "SAPUI5.Component=sap.ushell.demoapps.FioriSandboxConfigApp",
+                        navigationMode: "embedded"
                     },
                     none: {
                         applicationType: "URL",
@@ -1206,7 +1184,7 @@ sap.ui.define([
                 } else if (sHashFragment === "#Test-local1" || sHashFragment === "#Test-local2" || sHashFragment === "#Test-url") {
                     res = getFromLocalStorage("sap.ushell." + sHashFragment);
                     if (!res || res === "undefined") {
-                        oLocal = { applicationType: "URL" };
+                        oLocal = { applicationType: "URL", navigationMode: "embedded" };
                     } else {
                         oLocal = JSON.parse(res);
                     }

package/src/main/js/sap/ushell/services/NavigationDataProvider.js

@@ -4,7 +4,7 @@
  *
  * <p>This module prepares the navigation data needed by the page dereferencer.</p>
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/services/PageBuilding.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's page building service.
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery"

package/src/main/js/sap/ushell/services/PagePersistence.js

@@ -4,7 +4,7 @@
  *
  * <p>This module deals with the page persistence.</p>
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 
 sap.ui.define([], function () {

package/src/main/js/sap/ushell/services/PageReferencing.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module deals with page related referencing and dereferencing.
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/services/_PageReferencing/PageReferencer"

package/src/main/js/sap/ushell/services/Pages.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes a model containing the pages hierarchy to its clients.
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Personalization.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's personalization service, which provides generic read and write access to the currently logged on user's
  * personalization settings for the app currently executed in the shell.
  *
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/PluginManager.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's PluginManager service, which allows you to handle the loading of Fiori Launchpad plugins.
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ReferenceResolver.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview resolves references
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/Search.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's search service which provides Enterprise Search via SINA.
- * @version 1.117.1
+ * @version 1.118.0
  */
 sap.ui.define([], function () {
     "use strict";