@openui5/sap.m 1.97.1 → 1.100.0

package/src/sap/m/p13n/SelectionPanel.js

@@ -9,6 +9,7 @@ sap.ui.define([
 	"sap/m/ColumnListItem",
 	"sap/m/HBox",
 	"sap/m/VBox",
+	"sap/ui/core/library",
 	"sap/ui/core/Icon",
 	"sap/m/Text",
 	"sap/m/Column",
@@ -17,10 +18,14 @@ sap.ui.define([
 	"sap/m/ToolbarSpacer",
 	"sap/m/Button",
 	"sap/m/OverflowToolbar",
-	"sap/ui/model/Filter"
-], function(BasePanel, Label, ColumnListItem, HBox, VBox, Icon, Text, Column, Table, mLibrary, ToolbarSpacer, Button, OverflowToolbar, Filter) {
+	"sap/ui/model/Filter",
+	"sap/base/util/merge"
+], function(BasePanel, Label, ColumnListItem, HBox, VBox, coreLibrary, Icon, Text, Column, Table, mLibrary, ToolbarSpacer, Button, OverflowToolbar, Filter, merge) {
 	"use strict";
 
+	// shortcut for sap.ui.core.IconColor
+	var IconColor = coreLibrary.IconColor;
+
 	// shortcut for sap.m.ListKeyboardMode
 	var ListKeyboardMode = mLibrary.ListKeyboardMode;
 
@@ -37,18 +42,15 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 *
 	 * @class
-	 * This control can be used as personalization panel to define
-	 * content that may be added/removed for an associated control instance during runtime by the user.
+	 * This control can be used to customize personalization content for adding/removing items for an associated control instance.
 	 *
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
-	 *
-	 * @private
-	 * @ui5-restricted
-	 * @experimental
+	 * @version 1.100.0
 	 *
+	 * @public
+	 * @experimental Since 1.96.
 	 * @since 1.96
 	 * @alias sap.m.p13n.SelectionPanel
 	 */
@@ -57,15 +59,15 @@ sap.ui.define([
 			library: "sap.m",
 			properties: {
 				/**
-				 * Shows an additional header with a SearchField and 'Show Selected' button
+				 * Shows an additional header with a search field and the Show Selected button.
 				 */
 				showHeader: {
 					type: "boolean",
 					defaultValue: false
 				},
 				/**
-				 * Enables a count for selected items compared to available items as '<fields> (3 / 12)' in addition
-				 * for the first provided column text
+				 * Enables a count for selected items compared to available items, for example, Currency (3/12), in addition
+				 * to the first column text.
 				 */
 				enableCount: {
 					type: "boolean",
@@ -79,7 +81,7 @@ sap.ui.define([
 					defaultValue: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("p13n.DEFAULT_DESCRIPTION")
 				},
 				 /**
-				 * The secondary column in the panel showing the movement buttons for reordering.
+				 * The second column in the panel showing the move buttons for reordering.
 				 */
 				activeColumn: {
 					type: "string",
@@ -138,7 +140,7 @@ sap.ui.define([
 						new Icon({
 							src: "sap-icon://circle-task-2",
 							size: "0.5rem",
-							color: sap.ui.core.IconColor.Neutral,
+							color: IconColor.Neutral,
 							visible: {
 								path: this.P13N_MODEL + ">active",
 								formatter: function(bactive) {
@@ -266,8 +268,17 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	SelectionPanel.prototype.setP13nData = function() {
-		BasePanel.prototype.setP13nData.apply(this, arguments);
+	/**
+	 * Sets the personalization state of the panel instance.
+	 * @public
+	 * @param {sap.m.p13n.Item[]} aP13nData An array containing the personalization state that is represented by the <code>SelectionPanel</code>.
+	 */
+	SelectionPanel.prototype.setP13nData = function(aP13nData) {
+		if (this.getEnableCount()) {
+			aP13nData = merge([], aP13nData);
+			this._oListControl.removeSelections();
+		}
+		BasePanel.prototype.setP13nData.call(this, aP13nData);
 		this._updateCount();
 	};
 

package/src/sap/m/p13n/SortPanel.js

@@ -15,18 +15,16 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 *
 	 * @class
-	 * This control can be used to customize sort personalization content
+	 * This control can be used to customize personalization content for sorting
 	 * for an associated control instance.
 	 *
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
-	 *
-	 * @private
-	 * @ui5-restricted
-	 * @experimental
+	 * @version 1.100.0
 	 *
+	 * @public
+	 * @experimental Since 1.96.
 	 * @since 1.96
 	 * @alias sap.m.p13n.SortPanel
 	 */
@@ -40,6 +38,32 @@ sap.ui.define([
 	SortPanel.prototype.PRESENCE_ATTRIBUTE = "sorted";
 	SortPanel.prototype.CHANGE_REASON_SORTORDER = "sortorder";
 
+	/**
+	 * P13n <code>SortItem</code> object type.
+	 *
+	 * @type {sap.m.p13n.SortItem}
+	 * @static
+	 * @constant
+	 * @typedef {object} sap.m.p13n.SortItem
+	 * @property {string} name The unique key of the item
+	 * @property {string} label The label describing the personalization item
+	 * @property {boolean} sorted Defines the sorting state of the personalization item
+	 * @property {boolean} descending Defines the descending state of the personalization item
+	 *
+	 * @public
+	 */
+
+	/**
+	 * Sets the personalization state of the panel instance.
+	 * @name sap.m.p13n.SortPanel.setP13nData
+	 * @public
+	 * @function
+	 *
+	 * @param {sap.m.p13n.SortItem} aP13nData An array containing the personalization state
+	 * @returns {sap.m.p13n.SortPanel} The SortPanel instance
+	 *
+	 */
+
 	SortPanel.prototype._createRemoveButton = function () {
 		var oRemvoeBtn = QueryPanel.prototype._createRemoveButton.apply(this, arguments);
 		oRemvoeBtn.setLayoutData(new GridData({

package/src/sap/m/plugins/ColumnResizer.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.91
@@ -213,8 +213,8 @@ sap.ui.define([
 
 	/**
 	 * Returns the hovered column index. If column index is found the returns the index else returns -1.
-	 * @param {integer} iClientX clientX from the mouse/touch event
-	 * @returns {integer} hovered column index
+	 * @param {int} iClientX clientX from the mouse/touch event
+	 * @returns {int} hovered column index
 	 * @private
 	 */
 	ColumnResizer.prototype._getHoveredColumnIndex = function(iClientX) {
@@ -226,7 +226,7 @@ sap.ui.define([
 	/**
 	 * Returns the horizontal distance by which a column's width should be increased or decreased.
 	 * This gets called when columns must be automatically resized on the double click mouse.
-	 * @returns {integer} horizontal distance
+	 * @returns {int} horizontal distance
 	 * @private
 	 */
 	ColumnResizer.prototype._calculateAutoColumnDistanceX = function() {
@@ -254,7 +254,7 @@ sap.ui.define([
 
 	/**
 	 * Displays the resize handle on the column which is hovered
-	 * @param {integer} iColumnIndex column index
+	 * @param {int} iColumnIndex column index
 	 * @param {boolean} bMobileHandle indicates whether the alternate handle is visible
 	 * @private
 	 */
@@ -335,7 +335,7 @@ sap.ui.define([
 	 * - Next column and its width (if available).
 	 * - Maximum increase and decrease resize value.
 	 * - Existance of dummy column.
-	 * @param {integer} iIndex column index
+	 * @param {int} iIndex column index
 	 * @private
 	 */
 	ColumnResizer.prototype._startResizeSession = function(iIndex) {
@@ -357,7 +357,7 @@ sap.ui.define([
 
 	/**
 	 * Sets the horizontal resize distance to the session by which the column was increased or decreased.
-	 * @param {integer} iDistanceX horizontal resize distance
+	 * @param {int} iDistanceX horizontal resize distance
 	 * @private
 	 */
 	ColumnResizer.prototype._setSessionDistanceX = function(iDistanceX) {
@@ -421,7 +421,7 @@ sap.ui.define([
 	/**
 	 * This function is called when column resizing is trigger via keyboard events <code>onsapleftmodifiers</code> & <code>onsaprightmodifiers</code>.
 	 * @param {object} oEvent keyboard event
-	 * @param {integer} iDistanceX resize distance
+	 * @param {int} iDistanceX resize distance
 	 * @private
 	 */
 	ColumnResizer.prototype._onLeftRightModifiersKeyDown = function(oEvent, iDistanceX) {

package/src/sap/m/plugins/DataStateIndicator.js

@@ -19,7 +19,7 @@ sap.ui.define(["./PluginBase", "sap/ui/core/Core", "sap/ui/base/ManagedObjectObs
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.73

package/src/sap/m/plugins/PasteProvider.js

@@ -28,7 +28,7 @@ sap.ui.define(["./PluginBase", "sap/ui/core/Core", "sap/ui/core/util/PasteHelper
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.91

package/src/sap/m/plugins/PluginBase.js

@@ -20,7 +20,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @experimental Since 1.73. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/m/routing/RouteMatchedHandler.js

@@ -137,7 +137,7 @@ sap.ui.define(['sap/ui/base/Object', './TargetHandler', './Router', "sap/base/Lo
 		var iTargetViewLevel = +oEvent.getParameter("config").viewLevel;
 
 		this._oTargetHandler.navigate({
-			viewLevel: iTargetViewLevel,
+			level: iTargetViewLevel,
 			navigationIdentifier : oEvent.getParameter("name"),
 			askHistory: true
 		});

package/src/sap/m/routing/Router.js

@@ -13,7 +13,7 @@ sap.ui.define(['sap/ui/core/routing/Router', './TargetHandler', './Targets'],
 		 *
 		 * @class
 		 * SAPUI5 mobile <code>Router</code>.
-		 * The difference to the {@link sap.ui.core.routing.Router} are the <code>viewLevel</code>,
+		 * The difference to the {@link sap.ui.core.routing.Router} are the <code>level</code>,
 		 * <code>transition</code>, and <code>transitionParameters</code> properties that you can
 		 * specify in every Route or Target created by this router.
 		 *
@@ -156,7 +156,8 @@ sap.ui.define(['sap/ui/core/routing/Router', './TargetHandler', './Targets'],
 		 *     {
 		 *          //same name as in the config.bypassed.target
 		 *          notFound: {
-		 *              viewName: "notFound",
+		 *              type: "View"
+		 *              name: "notFound",
 		 *              ...
 		 *              // more properties to place the view in the correct container
 		 *          }
@@ -187,7 +188,7 @@ sap.ui.define(['sap/ui/core/routing/Router', './TargetHandler', './Targets'],
 		 *     ],
 		 *     // Default values shared by routes and Targets
 		 *     {
-		 *         viewNamespace: "my.application.namespace",
+		 *         path: "my.application.namespace",
 		 *         viewType: "XML"
 		 *     },
 		 *     // You should only use this constructor when you are not using a router with a component.
@@ -199,7 +200,8 @@ sap.ui.define(['sap/ui/core/routing/Router', './TargetHandler', './Targets'],
 		 *          //same name as in the route called 'startRoute'
 		 *          welcome: {
 		 *              // All properties for creating and placing a view go here or in the config
-		 *              viewName: "Welcome",
+		 *              type: "View",
+		 *              name: "Welcome",
 		 *              controlId: "app",
 		 *              controlAggregation: "pages"
 		 *          }
@@ -271,17 +273,17 @@ sap.ui.define(['sap/ui/core/routing/Router', './TargetHandler', './Targets'],
 			fireRoutePatternMatched : function (mArguments) {
 				var sRouteName = mArguments.name,
 					oRoute = this.getRoute(sRouteName),
-					iViewLevel;
+					iLevel;
 
 				// only if a route has a private target and does not use the targets instance of the router we need to inform the targethandler
 				if (oRoute._oTarget) {
 					if (this._oTargets && this._oTargets._oLastDisplayedTarget) {
-						iViewLevel = this._oTargets._getViewLevel(this._oTargets._oLastDisplayedTarget);
+						iLevel = this._oTargets._getLevel(this._oTargets._oLastDisplayedTarget);
 					}
 
 					this._oTargetHandler.navigate({
 						navigationIdentifier: sRouteName,
-						viewLevel: iViewLevel,
+						level: iLevel,
 						askHistory: true
 					});
 				}

package/src/sap/m/routing/TargetHandler.js

@@ -131,21 +131,21 @@ sap.ui.define(['sap/m/InstanceManager', 'sap/m/NavContainer', 'sap/m/SplitContai
 		 * @private
 		 */
 		TargetHandler.prototype._getDirection = function(oDirectionInfo) {
-			var iTargetViewLevel = oDirectionInfo.viewLevel,
+			var iTargetLevel = oDirectionInfo.level,
 				oHistory = History.getInstance(),
 				bBack = false;
 
 			if (oDirectionInfo.direction === "Backwards") {
 				bBack = true;
-			} else if (isNaN(iTargetViewLevel) || isNaN(this._iCurrentViewLevel) || iTargetViewLevel === this._iCurrentViewLevel) {
+			} else if (isNaN(iTargetLevel) || isNaN(this._iCurrentLevel) || iTargetLevel === this._iCurrentLevel) {
 				if (oDirectionInfo.askHistory) {
 					bBack = oHistory.getDirection() === "Backwards";
 				}
 			} else {
-				bBack = iTargetViewLevel < this._iCurrentViewLevel;
+				bBack = iTargetLevel < this._iCurrentLevel;
 			}
 
-			this._iCurrentViewLevel = iTargetViewLevel;
+			this._iCurrentLevel = iTargetLevel;
 
 			return bBack;
 		};

package/src/sap/m/routing/Targets.js

@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 * The mobile extension of <code>Targets</code> also handles the triggering
 		 * of page navigation when the target control is an <code>{@link sap.m.SplitContainer}</code>,
 		 * an <code>{@link sap.m.NavContainer}</code> or a control which extends one of these.
-		 * Other controls are also allowed, but the extra parameters <code>viewLevel</code>,
+		 * Other controls are also allowed, but the extra parameters <code>level</code>,
 		 * <code>transition</code> and <code>transitionParameters</code> are ignored and it behaves
 		 * as <code>{@link sap.ui.core.routing.Targets}</code>.
 		 *
@@ -25,7 +25,7 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 *
 		 * @extends sap.ui.core.routing.Targets
 		 * @param {object} oOptions
-		 * @param {sap.ui.core.routing.Views} oOptions.views the views instance will create the views of all the targets defined, so if 2 targets have the same viewName, the same instance of the view will be displayed.
+		 * @param {sap.ui.core.routing.Views} oOptions.views the views instance will create the views of all the targets defined, so if 2 targets have the same name, the same instance of the view will be displayed.
 		 * @param {object} [oOptions.config] this config allows all the values oOptions.targets.anyName allows, these will be the default values for properties used in the target.<br/>
 		 * For example if you are only using xmlViews in your app you can specify viewType="XML" so you don't have to repeat this in every target.<br/>
 		 * If a target specifies viewType="JS", the JS will be stronger than the XML here is an example.
@@ -81,13 +81,15 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 * {
 		 *     targets: {
 		 *         welcome: {
-		 *             viewName: "Welcome",
+		 *             type: "View",
+		 *             name: "Welcome",
 		 *             viewType: "XML",
 		 *             ....
 		 *             // Other target parameters
 		 *         },
 		 *         goodbye: {
-		 *             viewName: "Bye",
+		 *             type: "View",
+		 *             name: "Bye",
 		 *             viewType: "JS",
 		 *             ....
 		 *             // Other target parameters
@@ -99,22 +101,28 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 *
 		 * This will create two targets named 'welcome' and 'goodbye' you can display both of them or one of them using the {@link #display} function.
 		 *
-		 * @param {string} oOptions.targets.anyName.viewName The name of a view that will be created.
-		 * To place the view into a Control use the controlAggregation and controlId. Views will only be created once per viewName.
+		 * @param {string} oOptions.targets.anyName.type Defines whether the target creates an instance of 'View' or 'Component'.
+		 * @param {string} [oOptions.targets.anyName.name] Defines the name of the View or Component that will be
+		 * created. For type 'Component', use option <code>usage</code> instead if an owner component exists.
+		 * To place the view or component into a Control, use the options <code>controlAggregation</code> and
+		 * <code>controlId</code>. Instance of View or Component will only be created once per <code>name</code> or
+		 * <code>usage</code> combined with <code>id</code>.
 		 * <pre>
 		 * <code>
 		 * {
 		 *     targets: {
 		 *         // If display("masterWelcome") is called, the master view will be placed in the 'MasterPages' of a control with the id splitContainter
 		 *         masterWelcome: {
-		 *             viewName: "Welcome",
+		 *             type: "View",
+		 *             name: "Welcome",
 		 *             controlId: "splitContainer",
 		 *             controlAggregation: "masterPages"
 		 *         },
 		 *         // If display("detailWelcome") is called after the masterWelcome, the view will be removed from the master pages and added to the detail pages, since the same instance is used. Also the controls inside of the view will have the same state.
 		 *         detailWelcome: {
 		 *             // same view here, that's why the same instance is used
-		 *             viewName: "Welcome",
+		 *             type: "View",
+		 *             name: "Welcome",
 		 *             controlId: "splitContainer",
 		 *             controlAggregation: "detailPages"
 		 *         }
@@ -123,28 +131,26 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 * </code>
 		 * </pre>
 		 *
-		 * If you want to have a second instance of the welcome view you can use the following:
-		 *
-		 *
+		 * If you want to have a second instance of the welcome view you can assign the targets with different ids:
 		 *
 		 * <pre>
 		 * <code>
-		 * // Some code you execute before you display the taget named 'detailWelcome':
-		 * var oView = sap.ui.view(({ viewName : "Welcome", type : sap.ui.core.mvc.ViewType.XML});
-		 * oTargets.getViews().setView("WelcomeWithAlias", oView)
-		 *
 		 * {
 		 *     targets: {
-		 *         // If display("masterWelcome") is called, the master viewName will be placed in the 'MasterPages' of a control with the id splitContainter
+		 *         // If display("masterWelcome") is called, the "masterWelcome" view will be placed in the 'MasterPages' of a control with the id splitContainter
 		 *         masterWelcome: {
-		 *             viewName: "Welcome",
+		 *             type: "View",
+		 *             name: "Welcome",
+		 *             id: "masterWelcome",
 		 *             controlId: "splitContainer",
 		 *             controlAggregation: "masterPages"
 		 *         },
-		 *         // If display("detailWelcome") is called after the masterWelcome, a second instance with an own controller instance will be added in the detail pages.
+		 *         // If display("detailWelcome") is called after the "masterWelcome", a second instance with an own controller instance will be added in the detail pages.
 		 *         detailWelcome: {
-		 *             // same viewName here, that's why the same instance is used
-		 *             viewName: "WelcomeWithAlias",
+		 *             type: "View",
+		 *             name: "Welcome",
+		 *             // another instance will be created because a different id is used
+		 *             id: "detailWelcome",
 		 *             controlId: "splitContainer",
 		 *             controlAggregation: "detailPages"
 		 *         }
@@ -154,12 +160,13 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 * </pre>
 		 *
 		 *
+		 * @param {string} [oOptions.targets.anyName.usage] Defines the 'usage' name for 'Component' target which refers to the '/sap.ui5/componentUsages' entry in the owner component's manifest.
 		 * @param {string} [oOptions.targets.anyName.viewType=oOptions.config.viewType] The type of the view that is going to be created. These are the supported types: {@link sap.ui.core.mvc.ViewType}.
 		 * You always have to provide a viewType except if <code>oOptions.config.viewType</code> is set or using {@link sap.ui.core.routing.Views#setView}.
-		 * @param {string} [oOptions.targets.anyName.viewPath]
-		 * A prefix that will be prepended in front of the viewName.<br/>
-		 * <b>Example:</b> viewName is set to "myView" and viewPath is set to "myApp" - the created viewName will be "myApp.myView".
-		 * @param {string} [oOptions.targets.anyName.viewId] The id of the created view.
+		 * @param {string} [oOptions.targets.anyName.path]
+		 * A prefix that will be prepended in front of the <code>name</code>.<br/>
+		 * <b>Example:</b> <code>name</code> is set to "myView" and <code>path</code> is set to "myApp" - the created view's name will be "myApp.myView".
+		 * @param {string} [oOptions.targets.anyName.id] The id of the created view or component.
 		 * This is will be prefixed with the id of the component set to the views instance provided in oOptions.views. For details see {@link sap.ui.core.routing.Views#getView}.
 		 * @param {string} [oOptions.targets.anyName.targetParent]
 		 * The id of the parent of the controlId - This should be the id of the view that contains your controlId,
@@ -228,11 +235,13 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 *             // a reference to the app control in the rootView created by our UIComponent
 		 *             controlId: 'myApp',
 		 *             // An app has a pages aggregation where the views need to be put into
-		 *             controlAggregation: 'pages'
+		 *             controlAggregation: 'pages',
+		 *             // all targets have type "View"
+		 *             type: "View"
 		 *         },
 		 *         targets: {
 		 *             detail: {
-		 *                 viewName: 'Detail'
+		 *                 name: 'Detail'
 		 *             },
 		 *             secondTabContent: {
 		 *                 // A reference to the detail target defined above
@@ -242,7 +251,7 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 *                 // An IconTabFilter has an aggregation called content so we need to overwrite the pages set in the config as default.
 		 *                 controlAggregation: 'content',
 		 *                 // A view containing the content
-		 *                 viewName: 'SecondTabContent'
+		 *                 name: 'SecondTabContent'
 		 *             }
 		 *         }
 		 *     });
@@ -254,27 +263,28 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 * So a parent will always be created before the target referencing it.
 		 *
 		 *
-		 * @param {int} [oOptions.targets.anyName.viewLevel]
+		 * @param {int} [oOptions.targets.anyName.level]
 		 * If you are having an application that has a logical order of views (eg: a create account process, first provide user data, then review and confirm them).
 		 * You always want to show a backwards transition if a navigation from the confirm to the userData page takes place.
-		 * Therefore you may use the viewLevel. The viewLevel has to be an integer. The user data page should have a lower number than the confirm page.
+		 * Therefore you may use the <code>level</code>. The <code>level</code> has to be an integer. The user data page should have a lower number than the confirm page.
 		 * These levels should represent the user process of your application and they do not have to match the container structure of your Targets.
-		 * If the user navigates between views with the same viewLevel, a forward transition is taken. If you pass a direction into the display function, the viewLevel will be ignored.<br/>
+		 * If the user navigates between targets with the same <code>level</code>, a forward transition is taken.
+		 * If you pass a direction into the display function, the <code>level</code> will be ignored.<br/>
 		 * <b>Example:</b></br>
 		 * <pre>
 		 * <code>
 		 *     {
 		 *         targets: {
 		 *             startPage: {
-		 *                 viewLevel: 0
+		 *                 level: 0
 		 *                 // more properties
 		 *             },
 		 *             userData: {
-		 *                 viewLevel: 1
+		 *                 level: 1
 		 *                 // more properties
 		 *             },
 		 *             confirmRegistration: {
-		 *                 viewLevel: 2
+		 *                 level: 2
 		 *                 // more properties
 		 *             },
 		 *             settings: {
@@ -288,13 +298,13 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 		 * Currently the 'userData' target is displayed.
 		 * <ul>
 		 *     <li>
-		 *         If we navigate to 'startPage' the navContainer will show a backwards navigation, since the viewLevel is lower.
+		 *         If we navigate to 'startPage' the navContainer will show a backwards navigation, since the <code>level</code> is lower.
 		 *     </li>
 		 *     <li>
-		 *         If we navigate to 'userData' the navContainer will show a forwards navigation, since the viewLevel is higher.
+		 *         If we navigate to 'userData' the navContainer will show a forwards navigation, since the <code>level</code> is higher.
 		 *     </li>
 		 *     <li>
-		 *         If we navigate to 'settings' the navContainer will show a forwards navigation, since the viewLevel is not defined and cannot be compared.
+		 *         If we navigate to 'settings' the navContainer will show a forwards navigation, since the <code>level</code> is not defined and cannot be compared.
 		 *     </li>
 		 * </ul>
 		 *
@@ -379,17 +389,17 @@ sap.ui.define(['sap/ui/core/routing/Targets', './TargetHandler', './Target', './
 			 * @return {number} The view level
 			 * @private
 			 */
-			_getViewLevel : function (oTarget) {
-				var iViewLevel;
+			_getLevel : function (oTarget) {
+				var iLevel;
 				do {
-					iViewLevel = oTarget._oOptions.viewLevel;
-					if (iViewLevel !== undefined) {
-						return iViewLevel;
+					iLevel = oTarget._oOptions.hasOwnProperty("level") ? oTarget._oOptions.level : oTarget._oOptions.viewLevel;
+					if (iLevel !== undefined) {
+						return iLevel;
 					}
 					oTarget = oTarget._oParent;
 				} while (oTarget);
 
-				return iViewLevel;
+				return iLevel;
 			}
 		});
 

package/src/sap/m/routing/async/Targets.js

@@ -18,7 +18,7 @@ sap.ui.define([], function() {
 		 * @private
 		 */
 		_display: function () {
-			var iViewLevel,
+			var iLevel,
 				sName;
 
 			// don't remember previous displays
@@ -29,12 +29,12 @@ sap.ui.define([], function() {
 			return oPromise.then(function(oViewInfo) {
 				// maybe a wrong name was provided then there is no last displayed target
 				if (this._oLastDisplayedTarget) {
-					iViewLevel = this._getViewLevel(this._oLastDisplayedTarget);
+					iLevel = this._getLevel(this._oLastDisplayedTarget);
 					sName = this._oLastDisplayedTarget._oOptions._name;
 				}
 
 				this._oTargetHandler.navigate({
-					viewLevel: iViewLevel,
+					level: iLevel,
 					navigationIdentifier: sName,
 					askHistory: true
 				});

package/src/sap/m/routing/sync/Targets.js

@@ -18,7 +18,7 @@ sap.ui.define([], function() {
 		 * @private
 		 */
 		_display: function () {
-			var iViewLevel,
+			var iLevel,
 				sName;
 
 			// don't remember previous displays
@@ -28,12 +28,12 @@ sap.ui.define([], function() {
 
 			// maybe a wrong name was provided then there is no last displayed target
 			if (this._oLastDisplayedTarget) {
-				iViewLevel = this._getViewLevel(this._oLastDisplayedTarget);
+				iLevel = this._getLevel(this._oLastDisplayedTarget);
 				sName = this._oLastDisplayedTarget._oOptions._name;
 			}
 
 			this._oTargetHandler.navigate({
-				viewLevel: iViewLevel,
+				level: iLevel,
 				navigationIdentifier: sName,
 				askHistory: true
 			});

package/src/sap/m/rules/Breadcrumbs.support.js

@@ -42,7 +42,7 @@ sap.ui.define(["sap/ui/support/library"],
 					var sElementId = oElement.getId(),
 						sElementName = oElement.getMetadata().getElementName();
 
-					if (oElement.getParent() instanceof sap.m.OverflowToolbar) {
+					if (oElement.getParent() && oElement.getParent().isA("sap.m.OverflowToolbar")) {
 						oIssueManager.addIssue({
 							severity: Severity.Medium,
 							details: "Breadcrumbs '" + sElementName + "' (" + sElementId + ") is placed inside an OverflowToolbar.",

package/src/sap/m/rules/MessagePage.support.js

@@ -22,7 +22,7 @@ function(SupportLib) {
 	/**
 	 * Determines <code>Control</code> computed height.
 	 * @param {sap.ui.core.Control} oControl
-	 * @returns {Number}
+	 * @returns {number}
 	 */
 	var getControlHeight = function(oControl) {
 		return oControl.getDomRef().getBoundingClientRect().height;