@openui5/sap.ui.unified 1.91.0 → 1.93.2

package/.reuse/dep5

@@ -352,6 +352,11 @@ 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
+Comment: these files belong to: highlight.js
+
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/elasticlunr.js
 Copyright: 2017 Wei Song and Oliver Nightingale
 License: MIT
@@ -411,6 +416,35 @@ License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and BooleanExpressionEvaluator: BoolExprTool.js is authored by SAP, but partly inspired by BooleanExpressionEvaluator
 
 
+# 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/*.*
+Copyright: SAP
+License: Apache-2.0
+Comment: these files belong to: UI5 Web Components
+
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/*.*
+Copyright: Google LLC
+License: BSD-3-Clause
+Comment: these files belong to: lit-html
+
+
+# Library: sap.ui.webc.fiori:
+
+Files: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
+Copyright: SAP
+License: Apache-2.0
+Comment: these files belong to: UI5 Web Components
+
+
+# Library: sap.ui.webc.main:
+
+Files: src/sap.ui.webc.main/src/sap/ui/webc/main/thirdparty/*.*
+Copyright: SAP
+License: Apache-2.0
+Comment: these files belong to: UI5 Web Components
+
+
 # Outside of Libraries:
 
 Files: src/testsuite-utils/src/main/resources/META-INF/less/less.js
@@ -423,3 +457,15 @@ 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
+    2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
+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

@@ -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
@@ -330,6 +330,12 @@ 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
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
+Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
+
 Component: Elasticlunr, version: 0.9.5
 Copyright: 2017 Wei Song and Oliver Nightingale
 License: MIT
@@ -399,6 +405,43 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperators/BoolExprTool.js
 
 
+Library: sap.ui.webc.common:
+
+Component: UI5 Web Components, version: 1.0.0-rc.12
+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/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/*.*
+
+Component: lit-html, version: 1.4.1
+Copyright: Google LLC
+License: BSD-3-Clause
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
+Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/*.*
+
+
+Library: sap.ui.webc.fiori:
+
+Component: UI5 Web Components, version: 1.0.0-rc.12
+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.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
+
+
+Library: sap.ui.webc.main:
+
+Component: UI5 Web Components, version: 1.0.0-rc.12
+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.main/src/sap/ui/webc/main/thirdparty/*.*
+
+
 Outside of Libraries:
 
 Component: LESS, version: 1.6.3
@@ -413,6 +456,21 @@ 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.91.0",
+  "version": "1.93.2",
   "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.91.0"
+    "@openui5/sap.ui.core": "1.93.2"
   }
 }

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.91.0</version>
+  <version>1.93.2</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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -509,9 +509,9 @@ sap.ui.define([
 		if (aMonths.length > 1 && oMonthDate) {
 			// for more than one month - re-render same months (if already rendered once)
 			oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this.getPrimaryCalendarType());
-		}else if (aMonths.length > 1) {
+		} else if (aMonths.length > 1) {
 			oCalDate = _determineFirstMonthDate.call(this, this._getFocusedDate());
-		}else {
+		} else  {
 			oCalDate = oFocusedDate;
 		}
 
@@ -534,7 +534,6 @@ sap.ui.define([
 
 		this._updateHeader(oCalDate);
 
-		this._iSize = 0; // initialize to recalculate new after rendering
 		this._updateHeadersButtons();
 
 	};
@@ -800,7 +799,7 @@ sap.ui.define([
 				oMonth._bNoThemeChange = true;
 				this.addAggregation("month",oMonth);
 			}
-		}else if (aMonths.length > iMonths){
+		} else if (aMonths.length > iMonths){
 			for (i = aMonths.length; i > iMonths; i--) {
 				oMonth = this.removeAggregation("month", i - 1);
 				oMonth.destroy();
@@ -1060,7 +1059,7 @@ sap.ui.define([
 		var iMonths = _getMonths.call(this);
 		if (iMonths > 2) {
 			return true;
-		}else {
+		} else  {
 			return false;
 		}
 
@@ -1514,7 +1513,7 @@ sap.ui.define([
 		if (iYear < iYearMin || (iYear == iYearMin && ( !bCheckMonth || iMonth <= iMonthMin ))
 				|| (this._iMode == 1 && this._getSucessorsPickerPopup())) {
 			oHeader.setEnabledPrevious(false);
-		}else {
+		} else  {
 			oHeader.setEnabledPrevious(true);
 		}
 
@@ -1584,7 +1583,7 @@ sap.ui.define([
 				oFirstMonthDate.setDate(1);
 				this._setFocusedDate(oFirstMonthDate);
 				oFocusedDate = this._getFocusedDate();
-			}else {
+			} else  {
 				oFocusedDate.setDate(1);
 			}
 
@@ -1717,7 +1716,7 @@ sap.ui.define([
 			for (var i = 0; i < iMonths; i++) {
 				aMonths.push((iMonth + i) % 12);
 			}
-		}else {
+		} else  {
 			aMonths.push(iMonth);
 		}
 
@@ -2159,7 +2158,7 @@ sap.ui.define([
 			iMonth = oMonthPicker._focusedMonth || oMonthPicker._focusedMonth === 0 ?
 				oMonthPicker._focusedMonth :
 				oMonthPicker.getMonth(),
-			oSecondDate = Boolean(oMonthPicker._iYear) ?
+			oSecondDate = oMonthPicker._iYear ?
 				new CalendarDate(oMonthPicker._iYear, iMonth - 1, 1) :
 				new CalendarDate(this._getFocusedDate().getYear(), iMonth - 1, 1);
 
@@ -2557,7 +2556,7 @@ sap.ui.define([
 
 		if (this._oFocusedDate.isBefore(this._oMinDate)) {
 			this._oFocusedDate = new CalendarDate(this._oMinDate, sCalendarType);
-		}else if (this._oFocusedDate.isAfter(this._oMaxDate)){
+		} else if (this._oFocusedDate.isAfter(this._oMaxDate)){
 			this._oFocusedDate = new CalendarDate(this._oMaxDate, sCalendarType);
 		}
 
@@ -2571,6 +2570,12 @@ sap.ui.define([
 			return;
 		}
 
+		if (iWidth === this._iPrevWidth) {
+			return;
+		}
+
+		this._iPrevWidth = iWidth;
+
 		var iOldSize = this._iSize;
 		if (iWidth < this._iBreakPointTablet) {
 			this._iSize = 0; // phone
@@ -2644,6 +2649,8 @@ sap.ui.define([
 				var oMonth = aMonths[i];
 				oMonth.setWidth(sWidth);
 			}
+
+			this.invalidate();
 		}
 
 		this._setPrimaryHeaderMonthButtonText();

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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -78,9 +78,33 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 			 * @since 1.46.0
 			 */
 			color: {type : "sap.ui.core.CSSColor", group : "Appearance", defaultValue : null}
+		},
+		aggregations: {
+			/**
+			 * Holds the content of the appointment.
+			 *
+			 * <b>Note </b>, If the <code>customContent</code> aggregation is added then:
+			 *
+			 * <ul>
+			 * <li>The <code>title</code>, <code>text</code>, <code>description</code>, and <code>icon</code> properties
+			 * are ignored.</li>
+			 * <li>The application developer has to ensure, that all the accessibility requirements are met, and that
+			 * the height of the content conforms with the height provided by the appointment.</li>
+			 * <li>Do not use interactive controls as content, as they may trigger unwanted selection of the appointment
+			 * and may lead to unpredictable results.</li>
+			 * </ul>
+			 *
+			 * @since 1.93.0
+			 * @experimental Since 1.93, providing only limited functionality. Also, the API might be changed in the future.
+			 */
+			customContent: { type: "sap.ui.core.Control", multiple: true }
 		}
 	}});
 
+	CalendarAppointment.prototype.init = function () {
+		this._sAppointmentPartSuffix = null;
+	};
+
 	CalendarAppointment.prototype.applyFocusInfo = function (oFocusInfo) {
 
 		// let the parent handle the focus assignment after rerendering
@@ -213,6 +237,22 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 			].join(",") + ", 0.2)";
 	};
 
+	CalendarAppointment.prototype._setAppointmentPartSuffix = function (sSuffix) {
+		this._sAppointmentPartSuffix = sSuffix;
+		return this;
+	};
+
+	CalendarAppointment.prototype.getDomRef = function (sSuffix) {
+		if (document.getElementById(this.getId())) {
+			return document.getElementById(sSuffix ? this.getId() + "-" + sSuffix : this.getId());
+		} else if (this._sAppointmentPartSuffix) {
+			return document.getElementById(sSuffix ? this.getId() + "-" + this._sAppointmentPartSuffix + "-" + sSuffix : this.getId() + "-" + this._sAppointmentPartSuffix);
+		}
+
+		var oAppointmentParts = document.querySelectorAll(".sapUiCalendarRowApps[id^=" + this. getId() + "]");
+		return oAppointmentParts.length > 0 ? oAppointmentParts[0] : null;
+	};
+
 	return CalendarAppointment;
 
 });

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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -553,7 +553,7 @@ sap.ui.define([
 		var iDays = this._getDays();
 		if (iDays > this._iDaysMonthHead) {
 			return true;
-		}else {
+		} else  {
 			return false;
 		}
 
@@ -575,7 +575,7 @@ sap.ui.define([
 			if (!oStartDate) {
 				// use focused date as start date
 				this._setStartDate(this._oFocusedDate, false, true);
-			}else if (!oDatesRow.checkDateFocusable(this._oFocusedDate.toLocalJSDate())) {
+			} else if (!oDatesRow.checkDateFocusable(this._oFocusedDate.toLocalJSDate())) {
 				this._oFocusedDate = CalendarDate.fromLocalJSDate(oStartDate, this.getPrimaryCalendarType());
 			}
 		}
@@ -823,7 +823,7 @@ sap.ui.define([
 				(iYear == iYearMin &&
 						(!bCheckMonth || iMonth < iMonthMin || (iMonth == iMonthMin && iDate <= iDateMin)))) {
 			oHeader.setEnabledPrevious(false);
-		}else {
+		} else  {
 			oHeader.setEnabledPrevious(true);
 		}
 
@@ -1140,7 +1140,7 @@ sap.ui.define([
 				//focused date not longer visible -> focus start date
 				this._setFocusedDate(oStartDate);
 				oDatesRow.setDate(oLocaleDate);
-			}else {
+			} else  {
 				oDatesRow.setDate(oDate);
 			}
 		}

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @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.91.0
+	 * @version 1.93.2
 	 *
 	 * @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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -570,7 +570,7 @@ sap.ui.define([
 		if (this.getDomRef()) {
 			if (this._getShowItemHeader()) {
 				this.$().addClass("sapUiCalIntHead");
-			}else {
+			} else  {
 				this.$().removeClass("sapUiCalIntHead");
 			}
 		}
@@ -990,7 +990,7 @@ sap.ui.define([
 		var iMonths = this.getMonths();
 		if (iMonths > this._iDaysMonthsHead) {
 			return true;
-		}else {
+		} else  {
 			return false;
 		}
 
@@ -1015,7 +1015,7 @@ sap.ui.define([
 		}
 		if (oStartDate.isBefore(this._oMinDate)) {
 			oStartDate = new CalendarDate(this._oMinDate);
-		}else if (oStartDate.isAfter(oMaxDate)){
+		} else if (oStartDate.isAfter(oMaxDate)){
 			oStartDate = oMaxDate;
 		}
 
@@ -1035,7 +1035,7 @@ sap.ui.define([
 				//focused date not longer visible -> focus start date
 				this._setFocusedDate(oStartDate);
 				oMonthsRow.setDate(oLocaleDate);
-			}else {
+			} else  {
 				oMonthsRow.setDate(oDateTime);
 			}
 		}
@@ -1097,7 +1097,7 @@ sap.ui.define([
 
 		if (this._oFocusedDate.isBefore(this._oMinDate)) {
 			this._oFocusedDate = new CalendarDate(this._oMinDate);
-		}else if (this._oFocusedDate.isAfter(this._oMaxDate)){
+		} else if (this._oFocusedDate.isAfter(this._oMaxDate)){
 			this._oFocusedDate = new CalendarDate(this._oMaxDate);
 		}
 
@@ -1169,7 +1169,7 @@ sap.ui.define([
 
 		if (iYear < iYearMin || (iYear == iYearMin && iMonth <= iMonthMin )) {
 			oHeader.setEnabledPrevious(false);
-		}else {
+		} else  {
 			oHeader.setEnabledPrevious(true);
 		}
 
@@ -1178,7 +1178,7 @@ sap.ui.define([
 		iMonth = oDate.getMonth();
 		if (iYear > iYearMax || (iYear == iYearMax && iMonth >= iMonthMax)) {
 			oHeader.setEnabledNext(false);
-		}else {
+		} else  {
 			oHeader.setEnabledNext(true);
 		}
 
@@ -1239,10 +1239,10 @@ sap.ui.define([
 		if (oDate.isBefore(this._oMinDate)) {
 			oFocusedDate = this._oMinDate;
 			bChanged = true;
-		}else if (oDate.isAfter(this._oMaxDate)){
+		} else if (oDate.isAfter(this._oMaxDate)){
 			oFocusedDate = this._oMaxDate;
 			bChanged = true;
-		}else {
+		} else  {
 			oFocusedDate = oDate;
 		}
 

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.91.0
+		 * @version 1.93.2
 		 *
 		 * @constructor
 		 * @private

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

@@ -18,6 +18,7 @@ sap.ui.define([
 	'sap/ui/core/Locale',
 	"./CalendarRowRenderer",
 	"sap/ui/dom/containsOrEquals",
+	"sap/ui/events/checkMouseEnterOrLeave",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/unified/CalendarAppointment"
 ], function(
@@ -33,6 +34,7 @@ sap.ui.define([
 	Locale,
 	CalendarRowRenderer,
 	containsOrEquals,
+	checkMouseEnterOrLeave,
 	jQuery,
 	CalendarAppointment
 ) {
@@ -74,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.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -97,6 +99,12 @@ sap.ui.define([
 			 */
 			intervals : {type : "int", group : "Appearance", defaultValue : 12},
 
+			/**
+			 * Number of interval type units merged. It's used when presenting Relative View in sap.m.PlanningCalendar.
+			 * Note: If the value is more than 1, the NonWorkingDays type is not presented.
+			 */
+			intervalSize : { type: "int", group: "Appearance", defaultValue: 1},
+
 			/**
 			 * Type of the intervals of the row. The default is one hour.
 			 */
@@ -216,7 +224,6 @@ sap.ui.define([
 			 * @since 1.81.0
 			 */
 			appointmentRoundWidth: { type: "sap.ui.unified.CalendarAppointmentRoundWidth", group: "Appearance", defaultValue: CalendarAppointmentRoundWidth.None}
-
 		},
 		aggregations : {
 
@@ -289,7 +296,6 @@ sap.ui.define([
 					domRefId: {type: "string"}
 				}
 			},
-
 			/**
 			 * <code>startDate</code> was changed while navigating in <code>CalendarRow</code>
 			 */
@@ -576,7 +582,6 @@ sap.ui.define([
 	};
 
 	CalendarRow.prototype.onsapselect = function(oEvent){
-
 		// focused appointment must be selected
 		var aVisibleAppointments = this._getVisibleAppointments();
 
@@ -713,7 +718,7 @@ sap.ui.define([
 					this._sUpdateCurrentTime = setTimeout(this.updateCurrentTimeVisualization.bind(this), iTime);
 				}
 			}
-		}else {
+		} else  {
 			$Now.css("display", "none");
 		}
 
@@ -773,7 +778,7 @@ sap.ui.define([
 		var sId = oAppointment.getId();
 		if (this._sFocusedAppointmentId != sId) {
 			_focusAppointment.call(this, sId);
-		}else {
+		} else  {
 			oAppointment.focus();
 		}
 
@@ -837,6 +842,9 @@ sap.ui.define([
 	};
 
 	CalendarRow.prototype._getNonWorkingDays = function() {
+		if (this.getIntervalSize() !== 1) {
+			return [];
+		}
 
 		var aNonWorkingDays = this.getNonWorkingDays();
 
@@ -852,7 +860,7 @@ sap.ui.define([
 					aNonWorkingDays.push(i);
 				}
 			}
-		}else if (!Array.isArray(aNonWorkingDays)) {
+		} else if (!Array.isArray(aNonWorkingDays)) {
 			aNonWorkingDays = [];
 		}
 
@@ -1016,7 +1024,7 @@ sap.ui.define([
 		case CalendarIntervalType.Week:
 		case CalendarIntervalType.OneMonth:
 			oEndDate = new UniversalDate(this._oUTCStartDate.getTime());
-			oEndDate.setUTCDate(oEndDate.getUTCDate() + iIntervals);
+			oEndDate.setUTCDate(oEndDate.getUTCDate() + iIntervals * this.getIntervalSize());
 			break;
 
 		case CalendarIntervalType.Month:
@@ -1257,7 +1265,7 @@ sap.ui.define([
 			// focused appointment not visible or no focus set
 			if (aVisibleAppointments.length > 0) {
 				this._sFocusedAppointmentId = aVisibleAppointments[0].appointment.getId();
-			}else {
+			} else  {
 				this._sFocusedAppointmentId = undefined;
 			}
 		}
@@ -1540,7 +1548,7 @@ sap.ui.define([
 				oAppointment.level = -1; // level must be new calculated
 				bChanged = true;
 				$Appointment.addClass("sapUiCalendarAppSmall");
-			}else if ($Appointment.hasClass("sapUiCalendarAppSmall")){
+			} else if ($Appointment.hasClass("sapUiCalendarAppSmall")){
 				// not longer too small
 				oAppointment.end = oAppointment.calculatedEnd;
 				bChanged = true;
@@ -1894,7 +1902,7 @@ sap.ui.define([
 				$OldAppointment.attr("tabindex", "-1");
 				$Appointment.attr("tabindex", "0");
 				$Appointment.trigger("focus");
-			}else {
+			} else  {
 				// appointment not visible -> find it and show it
 				for (i = 0; i < aAppointments.length; i++) {
 					if (aAppointments[i].getId() == sId) {
@@ -2020,7 +2028,7 @@ sap.ui.define([
 				if (oEvent.type == "saphome") {
 					break;
 				}
-			}else if (aAppointments[i].getStartDate() > oLocalEndDate) {
+			} else if (aAppointments[i].getStartDate() > oLocalEndDate) {
 				break;
 			}
 		}