@openui5/sap.ui.unified 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.unified",
-  "version": "1.94.0",
+  "version": "1.97.0",
   "description": "OpenUI5 UI Library sap.ui.unified",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.94.0"
+    "@openui5/sap.ui.core": "1.97.0"
   }
 }

package/src/sap/ui/unified/.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>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

package/src/sap/ui/unified/Calendar.js

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -182,6 +182,14 @@ sap.ui.define([
 			 */
 			showWeekNumbers : {type : "boolean", group : "Appearance", defaultValue : true},
 
+			/**
+			 * Determines whether there is a shortcut navigation to Today. When used in Month, Year or
+			 * Year-range picker view, the calendar navigates to Day picker view.
+			 *
+			 * @since 1.95
+			 */
+			showCurrentDateButton : {type : "boolean", group : "Behavior", defaultValue : false},
+
 			/**
 			 * Holds a reference to the currently shown picker. Possible values: month, monthPicker, yearPicker and yearRangePicker.
 			 *
@@ -391,6 +399,7 @@ sap.ui.define([
 
 		oHeader.attachEvent("pressPrevious", this._handlePrevious, this);
 		oHeader.attachEvent("pressNext", this._handleNext, this);
+		oHeader.attachEvent("pressCurrentDate", this._handleCurrentDate, this);
 		oHeader.attachEvent("pressButton1", this._handleButton1, this);
 		oHeader.attachEvent("pressButton2", this._handleButton2, this);
 		oHeader.attachEvent("pressButton3", this._handleButton1, this);
@@ -1016,6 +1025,18 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Sets the visibility of the Current date button in the calendar.
+	 *
+	 * @param {boolean} bShow whether the Today button will be displayed
+	 * @return {this} <code>this</code> for method chaining
+	 * @public
+	 */
+	Calendar.prototype.setShowCurrentDateButton = function(bShow){
+		this.getAggregation("header").setVisibleCurrentDateButton(bShow);
+		return this.setProperty("showCurrentDateButton", bShow);
+	};
+
 	/**
 	 * Provides default behavior for setting min & max date.
 	 * It is also a hook for the sap.ui.unified.CalendarDateInterval.
@@ -1179,44 +1200,56 @@ sap.ui.define([
 	Calendar.prototype.onsaptabnext = function(oEvent){
 		var oHeader = this.getAggregation("header");
 
-			if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
-				if (oHeader.getVisibleButton1()) {
-					oHeader.getDomRef("B1").focus();
-					oEvent.preventDefault();
-				} else if (oHeader.getVisibleButton2()) {
-					oHeader.getDomRef("B2").focus();
-					oEvent.preventDefault();
-				} else if (!this._bPoupupMode) {
-					// remove Tabindex from day, month, year - to break cycle
-					this._clearTabindex0();
-				} else {
-					this._clearTabindex0();
-					oEvent.preventDefault();
-				}
-			} else if (oEvent.target.id === oHeader.getId() + "-B1") {
-				oHeader.getVisibleButton2() && oHeader.getDomRef("B2").focus();
-
+		if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
+			if (oHeader.getVisibleButton1()) {
+				oHeader.getDomRef("B1").focus();
+				oEvent.preventDefault();
+			} else if (oHeader.getVisibleButton2()) {
+				oHeader.getDomRef("B2").focus();
+				oEvent.preventDefault();
+			} else if (oHeader.getVisibleCurrentDateButton()) {
+				oHeader.getDomRef("today").focus();
+				oEvent.preventDefault();
+			} else if (!this._bPoupupMode) {
+				// remove Tabindex from day, month, year - to break cycle
+				this._clearTabindex0();
+			} else {
+				this._clearTabindex0();
 				oEvent.preventDefault();
-			} else if (oEvent.target.id === oHeader.getId() + "-B2") {
-				if (this._bPoupupMode) {
-					this._moveFocusToCalContent();
-
-					oEvent.preventDefault();
-				} else {
-					// remove Tabindex from day, month, year - to break cycle
-					this._clearTabindex0();
-				}
-
 			}
+		} else if (oEvent.target.id === oHeader.getId() + "-B1") {
+			oHeader.getVisibleButton2() && oHeader.getDomRef("B2").focus();
+			oEvent.preventDefault();
+		} else if (oEvent.target.id === oHeader.getId() + "-B2") {
+			if (oHeader.getVisibleCurrentDateButton()) {
+				oHeader.getDomRef("today").focus();
+				oEvent.preventDefault();
+			} else {
+				this._tabNextFinalize(this._bPoupupMode, oEvent);
+			}
+		} else if (oEvent.target.id === oHeader.getId() + "-today") {
+			this._tabNextFinalize(this._bPoupupMode, oEvent);
+		}
+
+	};
 
+	Calendar.prototype._tabNextFinalize = function(bPopupMode, oEvent) {
+		if (bPopupMode) {
+			this._moveFocusToCalContent();
+			oEvent.preventDefault();
+		} else {
+			// remove Tabindex from day, month, year - to break cycle
+			this._clearTabindex0();
+		}
 	};
 
 	Calendar.prototype.onsaptabprevious = function(oEvent){
 		var oHeader = this.getAggregation("header");
-
 		if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
 			if (this._bPoupupMode) {
-				if (oHeader.getVisibleButton2()) {
+				if (oHeader.getVisibleCurrentDateButton()) {
+					oHeader.getDomRef("today").focus();
+				} else if (oHeader.getVisibleButton2()) {
 					oHeader.getDomRef("B2").focus();
 				} else {
 					oHeader.getVisibleButton1() && oHeader.getDomRef("B1").focus();
@@ -1228,7 +1261,6 @@ sap.ui.define([
 			}
 		} else if (oEvent.target.id === oHeader.getId() + "-B1") {
 			this._moveFocusToCalContent();
-
 			oEvent.preventDefault();
 		} else if (oEvent.target.id === oHeader.getId() + "-B2") {
 			if (oHeader.getVisibleButton1()) {
@@ -1237,6 +1269,16 @@ sap.ui.define([
 				this._moveFocusToCalContent();
 			}
 
+			oEvent.preventDefault();
+		} else if (oEvent.target.id === oHeader.getId() + "-today") {
+			if (oHeader.getVisibleButton2()) {
+				oHeader.getDomRef("B2").focus();
+			} else if (oHeader.getVisibleButton1()){
+				oHeader.getDomRef("B1").focus();
+			} else {
+				this._moveFocusToCalContent();
+			}
+
 			oEvent.preventDefault();
 		}
 	};
@@ -1268,6 +1310,7 @@ sap.ui.define([
 
 	Calendar.prototype._moveFocusToCalContent = function() {
 		var oYearPicker = this.getAggregation("yearPicker"),
+			oYearRangePicker = this.getAggregation("yearRangePicker"),
 			oMonthPicker = this._getMonthPicker(),
 			aMonths = this.getAggregation("month"),
 			oMonth, oMonthDate,
@@ -1280,7 +1323,7 @@ sap.ui.define([
 					oMonth = aMonths[i];
 					oMonthDate = CalendarDate.fromLocalJSDate(oMonth.getDate(), this.getPrimaryCalendarType());
 					if (oFocusedDate.isSame(oMonthDate)) {
-						oMonth._oItemNavigation.focusItem(oMonth._oItemNavigation.getFocusedIndex());
+						oMonth.focus();
 					} else {
 						oMonth._oItemNavigation.getItemDomRefs()[oMonth._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
 					}
@@ -1289,16 +1332,23 @@ sap.ui.define([
 
 			case 1: // month picker
 				if (!this._getSucessorsPickerPopup()) {
-					oMonthPicker._oItemNavigation.focusItem(oMonthPicker._oItemNavigation.getFocusedIndex());
+					oMonthPicker.focus();
 				}
 				break;
 
 			case 2: // year picker
 				if (!this._getSucessorsPickerPopup()) {
-					oYearPicker._oItemNavigation.focusItem(oYearPicker._oItemNavigation.getFocusedIndex());
+					oYearPicker.focus();
+				}
+				break;
+
+			case 3: // year range picker
+				if (!this._getSucessorsPickerPopup()) {
+					oYearRangePicker.focus();
 				}
 				break;
-				// no default
+
+			// no default
 		}
 	};
 
@@ -1321,9 +1371,12 @@ sap.ui.define([
 
 	Calendar.prototype._focusOnShiftTab = function() {
 		var oHeader = this.getAggregation("header"),
-			oDomRefB2 = oHeader.getDomRef("B2");
+			oDomRefB2 = oHeader.getDomRef("B2"),
+			oDomRefToday = oHeader.getDomRef("today");
 
-		if (oDomRefB2) {
+		if (oDomRefToday) {
+			oDomRefToday.focus();
+		} else if (oDomRefB2) {
 			oDomRefB2.focus();
 		} else {
 			this.focus();
@@ -1689,6 +1742,16 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Handles navigation to today.
+	 *
+	 * @private
+	 */
+	Calendar.prototype._handleCurrentDate = function() {
+		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
+		this.focusDate(new Date());
+	};
+
 	Calendar.prototype._getYearString = function () {
 		var oYearPicker = this._getYearPicker(),
 			oYearPickerDomRef = oYearPicker.getDomRef(),
@@ -1973,6 +2036,7 @@ sap.ui.define([
 			for (i = 0; i < aMonths.length; ++i) {
 				if (aMonths[i].checkDateFocusable(oFocusedDate.toLocalJSDate())) {
 					aMonths[i].setDate(oFocusedDate.toLocalJSDate());
+					aMonths[i]._focusDate(oFocusedDate);
 					return;
 				}
 			}

package/src/sap/ui/unified/CalendarAppointment.js

@@ -21,7 +21,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarDateInterval.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @class
 	 * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegend.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegendItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarMonthInterval.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * <b>Note:</b> JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
 	 * But the date part of the Date object is not used. If a Date object is returned the date will be set to the 1st of the corresponding month.
 	 * @extends sap.ui.core.Control
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarOneMonthInterval.js

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * Navigation via year picker switches to the corresponding year and the same month as before the navigation.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/unified/CalendarRow.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @class
 	 * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
 	 * @extends sap.ui.core.Control
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -223,7 +223,16 @@ sap.ui.define([
 			 * @experimental Since 1.81.0
 			 * @since 1.81.0
 			 */
-			appointmentRoundWidth: { type: "sap.ui.unified.CalendarAppointmentRoundWidth", group: "Appearance", defaultValue: CalendarAppointmentRoundWidth.None}
+			appointmentRoundWidth: { type: "sap.ui.unified.CalendarAppointmentRoundWidth", group: "Appearance", defaultValue: CalendarAppointmentRoundWidth.None},
+
+			/**
+			 * Determines whether the selection of multiple appointments is enabled.
+			 *
+			 * Note: selection of multiple appointments is possible using CTRL key regardless of the value of this property.
+			 *
+			 * @since 1.97
+			 */
+			multipleAppointmentsSelection : {type : "boolean", group : "Data", defaultValue : false}
 		},
 		aggregations : {
 
@@ -590,7 +599,8 @@ sap.ui.define([
 		for (var i = 0; i < aVisibleAppointments.length; i++) {
 			var oAppointment = aVisibleAppointments[i].appointment;
 			if (containsOrEquals(oAppointment.getDomRef(), oEvent.target)) {
-				_selectAppointment.call(this, oAppointment, !(oEvent.ctrlKey || oEvent.metaKey));
+				var bRemoveOldSelection = !(this.getMultipleAppointmentsSelection() || oEvent.ctrlKey || oEvent.metaKey);
+				_selectAppointment.call(this, oAppointment, bRemoveOldSelection);
 				break;
 			}
 		}
@@ -708,6 +718,7 @@ sap.ui.define([
 				case CalendarIntervalType.Day:
 				case CalendarIntervalType.Week:
 				case CalendarIntervalType.OneMonth:
+				case "OneMonth":
 					iTime = 1800000;
 					break;
 
@@ -874,7 +885,7 @@ sap.ui.define([
 	 * returns if the appointments are rendered as list instead in a table
 	 */
 	CalendarRow.prototype._isOneMonthsRowOnSmallSizes = function() {
-		return this.getIntervalType() === CalendarIntervalType.OneMonth && this.getIntervals() === 1;
+		return (this.getIntervalType() === CalendarIntervalType.OneMonth || this.getIntervalType() === "OneMonth") && this.getIntervals() === 1;
 	};
 
 	/*
@@ -1025,6 +1036,7 @@ sap.ui.define([
 		case CalendarIntervalType.Day:
 		case CalendarIntervalType.Week:
 		case CalendarIntervalType.OneMonth:
+		case "OneMonth":
 			oEndDate = new UniversalDate(this._oUTCStartDate.getTime());
 			oEndDate.setUTCDate(oEndDate.getUTCDate() + iIntervals * this.getIntervalSize());
 			break;
@@ -1064,6 +1076,7 @@ sap.ui.define([
 		case CalendarIntervalType.Day:
 		case CalendarIntervalType.Week:
 		case CalendarIntervalType.OneMonth:
+		case "OneMonth":
 			oUTCStartDate.setUTCHours(0);
 			oUTCStartDate.setUTCMinutes(0);
 			oUTCStartDate.setUTCSeconds(0);
@@ -1453,6 +1466,7 @@ sap.ui.define([
 						case CalendarIntervalType.Day:
 						case CalendarIntervalType.Week:
 						case CalendarIntervalType.OneMonth:
+						case "OneMonth":
 							oIntervalEndDate.setUTCDate(oIntervalEndDate.getUTCDate() + 1);
 							if (j > 0) {
 								oIntervalStartDate.setUTCDate(oIntervalStartDate.getUTCDate() + 1);
@@ -1547,7 +1561,6 @@ sap.ui.define([
 				if (oAppointment.end < 0) {
 					oAppointment.end = 0;
 				}
-				oAppointment.level = -1; // level must be new calculated
 				bChanged = true;
 				$Appointment.addClass("sapUiCalendarAppSmall");
 			} else if ($Appointment.hasClass("sapUiCalendarAppSmall")){
@@ -1557,6 +1570,10 @@ sap.ui.define([
 				$Appointment.removeClass("sapUiCalendarAppSmall");
 			}
 
+			if (bChanged) {
+				oAppointment.level = -1; // level must be new calculated
+			}
+
 			if (bChanged && !bHorizontalFit) {
 				if (this._bRTL) {
 					$Appointment.css("left", oAppointment.end + "%");
@@ -2002,6 +2019,7 @@ sap.ui.define([
 		case CalendarIntervalType.Day:
 		case CalendarIntervalType.Week:
 		case CalendarIntervalType.OneMonth:
+		case "OneMonth":
 			oStartDate.setUTCDate(1);
 			oEndDate.setUTCMonth(oEndDate.getUTCMonth() + 1);
 			oEndDate.setUTCDate(1);
@@ -2093,6 +2111,7 @@ sap.ui.define([
 		case CalendarIntervalType.Day:
 		case CalendarIntervalType.Week:
 		case CalendarIntervalType.OneMonth:
+		case "OneMonth":
 			oIntervalStartDate.setUTCDate(oIntervalStartDate.getUTCDate() + iInterval);
 			if (bSubInterval) {
 				oIntervalStartDate.setUTCHours(oIntervalStartDate.getUTCHours() + iSubInterval * 24 / iSubIntervals);