@openui5/sap.m 1.93.3 → 1.96.1

package/src/sap/m/SinglePlanningCalendar.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 // Provides control sap.m.SinglePlanningCalendar.
 sap.ui.define([
 	'./library',
@@ -69,11 +64,13 @@ function(
 	 *
 	 * <h3>Overview</h3>
 	 *
-	 * <b>Note:</b> The <code>SinglePlanningCalendar</code> uses parts of the <code>sap.ui.unified</code> library.
+	 * <b>Note:</b> The application developer should add dependency to <code>sap.ui.unified</code> library on application level
+	 * to ensure that the library is loaded before the module dependencies will be required.
+	 * The <code>SinglePlanningCalendar</code> uses parts of the <code>sap.ui.unified</code> library.
 	 * This library will be loaded after the <code>SinglePlanningCalendar</code>, if it wasn't previously loaded.
-	 * This could lead to a waiting time when a <code>SinglePlanningCalendar</code> is used for the first time.
+	 * This could lead to CSP compliance issues and adds an additional waiting time when a <code>SinglePlanningCalendar</code> is used for the first time.
 	 * To prevent this, apps using the <code>SinglePlanningCalendar</code> must also load the
-	 * <code>sap.ui.unified</code> library.
+	 * <code>sap.ui.unified</code> library in advance.
 	 *
 	 * The <code>SinglePlanningCalendar</code> has the following structure:
 	 *
@@ -105,7 +102,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @public
@@ -1073,7 +1070,7 @@ function(
 
 		var fnHandleHeadersSelect = function(oEvent) {
 			this.fireHeaderDateSelect({
-				date: oEvent.getSource().getDate()
+				date: oEvent.getSource()._oDate.toLocalJSDate()
 			});
 		};
 		var fnHandleAppointmentSelect = function(oEvent) {

package/src/sap/m/SinglePlanningCalendarDayView.js

@@ -25,7 +25,7 @@ function (library, SinglePlanningCalendarView) {
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarGrid.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 // Provides control sap.m.SinglePlanningCalendarGrid.
 sap.ui.define([
 		'./SinglePlanningCalendarUtilities',
@@ -101,7 +96,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @private
@@ -951,7 +946,7 @@ sap.ui.define([
 		 * @private
 		 */
 		SinglePlanningCalendarGrid.prototype._appFocusHandler = function(oEvent, iDirection) {
-			var oTarget = sap.ui.getCore().byId(oEvent.target.id);
+			var oTarget = sap.ui.getCore().byId(oEvent.target.id) || this._findSrcControl(oEvent);
 
 			if (oTarget && oTarget.isA("sap.ui.unified.CalendarAppointment")) {
 				this.fireAppointmentSelect({
@@ -1210,13 +1205,18 @@ sap.ui.define([
 		};
 
 		SinglePlanningCalendarGrid.prototype._findSrcControl = function (oEvent) {
-			if (!oEvent.target.parentElement || !oEvent.target.parentElement.classList.contains("sapUiCalendarRowApps")) {
-				return oEvent.srcControl;
-			}
-
 			// data-sap-ui-related - This is a relation to appointment object.
 			// This is the connection between the DOM Element and the Object representing an appointment.
-			var sAppointmentId = oEvent.target.parentElement.getAttribute("data-sap-ui-related");
+			var $targetElement = oEvent.target,
+				$targetsParentElement = $targetElement.parentElement,
+				sAppointmentId;
+			if (!$targetsParentElement) {
+				return oEvent.srcControl;
+			} else if ($targetsParentElement.classList.contains("sapUiCalendarRowApps")) {
+				sAppointmentId = $targetsParentElement.getAttribute("data-sap-ui-related");
+			} else {
+				sAppointmentId = $targetElement.getAttribute("data-sap-ui-related");
+			}
 
 			// finding the appointment
 			return this.getAppointments().find(function (oAppointment) {
@@ -1304,7 +1304,9 @@ sap.ui.define([
 			if (!this.getEndHour()) {
 				iEndHour = LAST_HOUR_OF_DAY;
 			}
-
+			if (iStartHour > iEndHour) {
+				 return iStartHour <= iHour || iHour < iEndHour;
+			}
 			return iStartHour <= iHour && iHour < iEndHour;
 		};
 

package/src/sap/m/SinglePlanningCalendarGridRenderer.js

@@ -4,13 +4,23 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
-sap.ui.define(['sap/ui/unified/calendar/CalendarDate', 'sap/ui/unified/calendar/CalendarUtils', 'sap/ui/core/date/UniversalDate', 'sap/ui/core/InvisibleText', './PlanningCalendarLegend', 'sap/ui/unified/library'],
-	function(CalendarDate, CalendarUtils, UniversalDate, InvisibleText, PlanningCalendarLegend, unifiedLibrary) {
+sap.ui.define([
+	'sap/ui/unified/calendar/CalendarDate',
+	'sap/ui/unified/calendar/CalendarUtils',
+	'sap/ui/core/date/UniversalDate',
+	'sap/ui/core/IconPool',
+	'sap/ui/core/InvisibleText',
+	'./PlanningCalendarLegend',
+	'sap/ui/unified/library'
+	],
+	function(
+		CalendarDate,
+		CalendarUtils,
+		UniversalDate,
+		IconPool,
+		InvisibleText,
+		PlanningCalendarLegend,
+		unifiedLibrary) {
 		"use strict";
 
 		var iVerticalPaddingBetweenAppointments = 2;

package/src/sap/m/SinglePlanningCalendarMonthGrid.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 // Provides control sap.m.SinglePlanningCalendarMonthGrid.
 sap.ui.define([
 	'sap/ui/core/Control',
@@ -81,7 +76,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SinglePlanningCalendarMonthGridRenderer.js

@@ -4,25 +4,23 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 sap.ui.define([
 	'sap/ui/unified/calendar/CalendarDate',
 	'sap/ui/unified/calendar/CalendarUtils',
 	'sap/ui/unified/calendar/Month',
 	'sap/ui/core/date/UniversalDate',
+	'sap/ui/core/IconPool',
 	'./PlanningCalendarLegend',
 	'sap/ui/core/InvisibleText',
 	'sap/ui/core/Core',
-	'sap/ui/unified/library'],
+	'sap/ui/unified/library'
+	],
 	function(
 		CalendarDate,
 		CalendarUtils,
 		Month,
 		UniversalDate,
+		IconPool,
 		PlanningCalendarLegend,
 		InvisibleText,
 		Core,

package/src/sap/m/SinglePlanningCalendarMonthView.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 sap.ui.define([
 	'./library',
 	'./SinglePlanningCalendarView',
@@ -33,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.m.SinglePlanningCalendarView
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SinglePlanningCalendarView.js

@@ -26,7 +26,7 @@ function (library, Log, Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarWeekView.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 sap.ui.define([
 	'./library',
 	'./SinglePlanningCalendarView',
@@ -32,7 +27,7 @@ function (library, SinglePlanningCalendarView, CalendarDate, CalendarUtils) {
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarWorkWeekView.js

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 sap.ui.define([
 	'./library',
 	'./SinglePlanningCalendarView',
@@ -33,7 +28,7 @@ function (library, SinglePlanningCalendarView, CalendarDate, CalendarUtils, Loca
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SlideTile.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.34
 	 *
 	 * @public
@@ -77,7 +77,13 @@ sap.ui.define([
 				 * Width of the control.
 				 * @since 1.72
 				 */
-				width: {type: "sap.ui.core.CSSSize", group: "Appearance"}
+				width: {type: "sap.ui.core.CSSSize", group: "Appearance"},
+				/**
+				 * Height of the control.
+				 * @experimental
+				 * @since 1.96
+				 */
+				height: {type: "sap.ui.core.CSSSize", group: "Appearance"}
 			},
 			defaultAggregation: "tiles",
 			aggregations: {
@@ -182,6 +188,23 @@ sap.ui.define([
 			this._hasNewsContent(this._iCurrentTile)) {
 			this.addStyleClass("sapMSTDarkBackground");
 		}
+
+		// Slide Navigation through bullet click
+		var oCurrentBullet;
+		for (var i = 0; i < this.getTiles().length; i++) {
+			oCurrentBullet = document.querySelector('span[id$="tileIndicator-' + i + '"]');
+			if (oCurrentBullet) {
+				oCurrentBullet.addEventListener("click", function(event) {
+					var sId = event.currentTarget.id,
+						iCurrentIndex = parseInt(sId.substring(sId.lastIndexOf("-") + 1)),
+						bIsbackward = this._iCurrentTile > iCurrentIndex;
+
+					if (this._iCurrentTile !== iCurrentIndex) {
+						this._scrollToNextTile(this._bAnimationPause, bIsbackward, iCurrentIndex);
+					}
+				}.bind(this));
+			}
+		}
 	};
 
 	/**
@@ -479,8 +502,9 @@ sap.ui.define([
 	 * @private
 	 * @param {boolean} pause Triggers if the animation gets paused or not
 	 * @param {boolean} backward Sets the direction backward or forward
+	 * @param {integer} iNextTile Scrolls to custom tile
 	 */
-	SlideTile.prototype._scrollToNextTile = function (pause, backward) {
+	SlideTile.prototype._scrollToNextTile = function (pause, backward, iNextTile) {
 		var iTransitionTime = this._iCurrAnimationTime - this.getDisplayTime(),
 			bFirstAnimation, iNxtTile, oWrapperFrom, oWrapperTo, sWidthFrom, fWidthTo, fWidthFrom, bChangeSizeBefore, sDir, oDir;
 
@@ -497,6 +521,10 @@ sap.ui.define([
 			this._iCurrentTile = iNxtTile;
 		}
 
+		if (iNextTile >= 0) {
+			this._iCurrentTile = iNextTile;
+		}
+
 		oWrapperTo = this.$("wrapper-" + this._iCurrentTile);
 		sDir = sap.ui.getCore().getConfiguration().getRTL() ? "right" : "left";
 

package/src/sap/m/SlideTileRenderer.js

@@ -32,6 +32,12 @@ sap.ui.define(['./library', "sap/base/security/encodeCSS"],
 			iLength;
 
 		oRm.openStart("div", oControl);
+		if (oControl.getHeight()) {
+			oRm.style("height",oControl.getHeight());
+		}
+		if (oControl.getWidth()) {
+			oRm.style("width",oControl.getWidth());
+		}
 		oRm.class("sapMST");
 		oRm.class(sScopeClass);
 		if (!this._bAnimationPause) {
@@ -66,6 +72,9 @@ sap.ui.define(['./library', "sap/base/security/encodeCSS"],
 		for (var i = 0; i < iLength; i++) {
 			oRm.openStart("div", oControl.getId() + "-wrapper-" + i );
 			oRm.class("sapMSTWrapper");
+			if (oControl.getTiles()[i].getFrameType() == sap.m.FrameType.Stretch && oControl.getTiles()[i].getMode() == sap.m.GenericTileMode.ArticleMode) {
+				oRm.class("sapMGTTileStretch");
+			}
 			oRm.openEnd();
 			oRm.renderControl(oControl.getTiles()[i]);
 			oRm.close("div");

package/src/sap/m/Slider.js

@@ -95,7 +95,7 @@ function(
 		 * @implements sap.ui.core.IFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SliderTooltip.js

@@ -44,7 +44,7 @@ function(
 		 * @extends sap.m.SliderTooltipBase
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SliderTooltipBase.js

@@ -21,7 +21,7 @@ function(Control, Library, SliderTooltipBaseRenderer) {
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SliderTooltipContainer.js

@@ -35,7 +35,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SplitApp.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.SplitContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SplitButton.js

@@ -48,7 +48,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @constructor
 		 * @private
@@ -256,15 +256,11 @@ function(
 				oEvent.preventDefault();
 			}
 
-			if (oEvent.which === KeyCodes.ENTER) {
-				this._getTextButton().firePress({/* no parameters */ });
-			}
+			this._getTextButton().onkeydown(oEvent);
 		};
 
 		SplitButton.prototype.onkeyup = function(oEvent) {
-			if (oEvent.which === KeyCodes.SPACE) {
-				this._getTextButton().firePress({/* no parameters */ });
-			}
+			this._getTextButton().onkeyup(oEvent);
 		};
 
 		SplitButton.prototype.onsapup = function(oEvent) {

package/src/sap/m/SplitContainer.js

@@ -86,7 +86,7 @@ function(
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @public
@@ -2138,16 +2138,20 @@ function(
 	 * @param {object} mSettings Object containing the aggregation name
 	 * @param {string} mSettings.aggregation The aggregation name to decide on which column/container the placeholder should be shown
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAPUI5 Distribution libraries only
 	 * @since 1.91
 	 */
 	SplitContainer.prototype.showPlaceholder = function(mSettings) {
-		switch (mSettings.aggregation) {
+		if (!sap.ui.getCore().getConfiguration().getPlaceholder()) {
+			return;
+		}
+
+		switch (mSettings && mSettings.aggregation) {
 			case "masterPages":
-				this.getAggregation("_navMaster").showPlaceholder(mSettings);
-				break;
+				return this.getAggregation("_navMaster").showPlaceholder(mSettings);
 			default:
-				this.getAggregation("_navDetail").showPlaceholder(mSettings);
+				return this.getAggregation("_navDetail").showPlaceholder(mSettings);
 		}
 	};
 
@@ -2157,7 +2161,8 @@ function(
 	 * @param {object} mSettings Object containing the aggregation name
 	 * @param {string} mSettings.aggregation The aggregation name to decide on which column/container the placeholder should be hidden
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAP internal apps
 	 * @since 1.91
 	 */
 	SplitContainer.prototype.hidePlaceholder = function(mSettings) {
@@ -2193,7 +2198,7 @@ function(
 				oContainer = this.getAggregation("_navDetail");
 		}
 
-		return oContainer.getCurrentPage() !== oObject;
+		return !oObject || (oContainer.getCurrentPage() !== oObject);
 	};
 	/**************************************************************
 	* END - Private methods

package/src/sap/m/StandardDynamicDateOption.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 *
 		 * @public
 		 * @alias sap.m.StandardDynamicDateOption
@@ -241,6 +241,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		/**
 		 * Creates a UI for this DynamicDateOption.
 		 * @param {*} oOptions some parameters that can adapt the UI from outside
+		 * @param {function} fnControlsUpdated A callback invoked when any of the created controls updates its value
 		 *
 		 * Returns an array of controls which is mapped to the parameters of this DynamicDateOption.
 		 */
@@ -320,14 +321,6 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			oControl.setMin(iMin);
 			oControl.setMax(MAX_VALUE_HELP_INTEGER);
 
-			if (oControl.getValue() < iMin) {
-				oControl.setValue(iMin);
-			}
-
-			if (oControl.getValue() > MAX_VALUE_HELP_INTEGER) {
-				oControl.setValue(MAX_VALUE_HELP_INTEGER);
-			}
-
 			return oControl;
 		};
 
@@ -346,7 +339,9 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			}
 
 			if (fnControlsUpdated instanceof Function) {
-				oControl.attachSelect(fnControlsUpdated);
+				oControl.attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
 			}
 
 			return oControl;
@@ -368,6 +363,46 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			return undefined;
 		};
 
+		/**
+		 * Validates all input controls in the value help UI related to the current option.
+		 * If one of the input controls contains invalid value, then validation will return <code>false</code>.
+		 * If all input controls contain valid value, then the validation will return <code>true</code>.
+		 *
+		 * @public
+		 * @param {sap.m.DynamicDateRange} oControl The control instance
+		 * @returns {boolean} value help UI validity indicator
+		 */
+		StandardDynamicDateOption.prototype.validateValueHelpUI = function(oControl) {
+			var aParams = this.getValueHelpUITypes();
+
+			for (var i = 0; i < aParams.length; i++) {
+				var oInputControl = oControl.aControlsByParameters[this.getKey()][i];
+
+				switch (aParams[i].getType()) {
+					case "int":
+						if (oInputControl._isLessThanMin(oInputControl.getValue()) ||
+							oInputControl._isMoreThanMax(oInputControl.getValue())) {
+							return false;
+						}
+						break;
+					case "month":
+					case "date":
+					case "daterange":
+						if (!oInputControl.getSelectedDates() || oInputControl.getSelectedDates().length == 0) {
+							return false;
+						}
+						break;
+					case "options":
+						if (oInputControl.getSelectedIndex() < 0) {
+							return false;
+						}
+						break;
+				}
+			}
+
+			return true;
+		};
+
 		// Gets the output for each input parameter.
 		// Returns an object { operator: "KEY", values: [] (mapped positionally to each input control) }.
 		StandardDynamicDateOption.prototype.getValueHelpOutput = function(oControl) {
@@ -462,9 +497,12 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 					oDate = UniversalDateUtils.getMonthStartDate(oDate);
 					return UniversalDateUtils.getRange(0, "MONTH", oDate);
 				case "DATE":
-					return [oValue.values[0], oValue.values[0]];
+					return UniversalDateUtils.getRange(0, "DAY", UniversalDate.getInstance(oValue.values[0]));
 				case "DATERANGE":
-					return oValue.values.slice(0);
+					var oStart = UniversalDate.getInstance(oValue.values[0]);
+					var oEnd = UniversalDate.getInstance(oValue.values[1]);
+
+					return [UniversalDateUtils.resetStartTime(oStart), UniversalDateUtils.resetEndTime(oEnd)];
 				case "TODAY":
 					return UniversalDateUtils.ranges.today();
 				case "YESTERDAY":