@sapui5/sap.suite.ui.commons 1.116.0 → 1.118.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.commons",
-  "version": "1.116.0",
+  "version": "1.118.1",
   "description": "SAPUI5 Library sap.suite.ui.commons",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/suite/ui/commons/.library

@@ -7,7 +7,7 @@
 		SAP UI development toolkit for HTML5 (SAPUI5)
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.116.0</version>
+	<version>1.118.1</version>
 
 	<documentation>SAP UI library: sap.suite.ui.commons</documentation>
 

package/src/sap/suite/ui/commons/AriaProperties.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.65.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilder.js

@@ -124,7 +124,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderExpression.js

@@ -111,7 +111,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderFunction.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderGroup.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.60.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderItem.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderValidationResult.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderVariable.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CloudFilePicker.js

@@ -111,7 +111,7 @@ sap.ui.define([
 	 * @class
 	 * @public
 	 * @internal
-	 * @version 1.116.0
+	 * @version 1.118.1
 	*/
 	var CloudFilePicker = Dialog.extend("sap.suite.ui.commons.CloudFilePicker", {
 		metadata: {
@@ -199,6 +199,13 @@ sap.ui.define([
 					type: "sap.suite.ui.commons.FilePickerType",
 					group: "Data",
 					defaultValue: "Export"
+				},
+				/**
+				 * Specifies the MIME type of the file during Export
+				 */
+				MIMEType: {
+					type: "string",
+					group: "Data"
 				}
 			},
 			events: {
@@ -562,6 +569,7 @@ sap.ui.define([
 					dataReceived: function () {
 						this.oTableControl.setNoData(null);
 						this.oTableControl.setNoDataText(oResourceBundle.getText("CFP_NO_DATA_FILESHARE"));
+						this.oTableControl.setBusy(false);
 						this.setBusy(false);
 					}.bind(this)
 				},
@@ -722,7 +730,7 @@ sap.ui.define([
 				var sFileShareKey = this.oSelectControl.getSelectedKey();
 				var sSearchText = oEvent.target.value;
 				var sDocumentType = "folder";
-				this._checkForDuplicateFileAndFolder(sSearchText, sFileShareKey, sDocumentType)
+				this._checkForDuplicateFileAndFolder(sSearchText, sFileShareKey, sDocumentType, "")
 				.then(function (oSuccess) {
 					this.setBusy(false);
 					if (oSuccess.value.length) {
@@ -768,10 +776,10 @@ sap.ui.define([
 		});
 	};
 
-	CloudFilePicker.prototype._checkForDuplicateFileAndFolder = function (sSearchText, sFileShareKey, sDocumentType) {
+	CloudFilePicker.prototype._checkForDuplicateFileAndFolder = function (sSearchText, sFileShareKey, sDocumentType, sContentType) {
 		var sFileShareItem = this.aVisibleLinks[this.aVisibleLinks.length - 1].fileShareItemId;
 		var sPath = "/FileShareItems(FileShare='" + sFileShareKey + "',FileShareItem='" + sFileShareItem + "')/_Query";
-		var oContextBinding = this.getModel().bindContext(sPath, "", {"$filter":"FileShareItemName eq \'" + sSearchText + "\'and FileShareItemKind eq \'" + sDocumentType + "\'"});
+		var oContextBinding = this.getModel().bindContext(sPath, "", {"$filter": "FileShareItemName eq \'" + sSearchText + "\'and FileShareItemKind eq \'" + sDocumentType + "\'and FileShareItemContentType eq \'" + sContentType + "\'"});
 		return oContextBinding.requestObject();
 	};
 
@@ -797,7 +805,7 @@ sap.ui.define([
 		var oNewFolderContext = oBinding.create({
 				FileShareItemName: sFolderName,
 				FileShareItemKind: 'folder'
-		}, true, false, false);
+		}, false, false, false);
 
 		// handle success/failure of POST request triggered for a #create on this binding
 		var fnCreateCompleted = function(oEvent) {
@@ -961,20 +969,38 @@ sap.ui.define([
 			enabled: false,
 			press: function () {
 				this.setBusy(true);
-				var sCurrentItemInInput = this.oFileNameControl.getValue();
-				if ((this.getFilePickerMode() === FilePickerModes.FileOnly) || sCurrentItemInInput) {
+				var sCurrentItemInputName = this.oFileNameControl.getValue();
+				//Appending MIME type only for Excel as it is not necessary for Google Sheets
+				if (this.getMIMEType() && this.getMIMEType() === ".xlsx" && sCurrentItemInputName.indexOf(".xlsx") < 0) {
+					sCurrentItemInputName = sCurrentItemInputName + this.getMIMEType();
+				}
+				if ((this.getFilePickerMode() === FilePickerModes.FileOnly) || sCurrentItemInputName) {
 					if (this.getEnableDuplicateCheck()) {
 						var sDocumentType = "document";
-						this._checkForDuplicateFileAndFolder(sCurrentItemInInput, this.oSelectControl.getSelectedKey(), sDocumentType)
+						var oFileMIMETypes = {
+							".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+							".gsheet": "application/vnd.google-apps.spreadsheet"
+						};
+						var sCurrentFileMIMEType = oFileMIMETypes[this.getMIMEType()];
+						this._checkForDuplicateFileAndFolder(sCurrentItemInputName, this.oSelectControl.getSelectedKey(), sDocumentType, sCurrentFileMIMEType ? sCurrentFileMIMEType : '')
 						.then(function (oSuccess) {
 							this.setBusy(false);
-							if (oSuccess.value.length) {
-								this._showOverwriteMessage(sCurrentItemInInput);
+							var sExportingMIMEType = this.getMIMEType() ? oFileMIMETypes[this.getMIMEType()] : oFileMIMETypes[".gsheet"];
+							this.oReturnedDupFileInfo = oSuccess.value.find(function(oValue) {
+								return oValue.FileShareItemContentType === sExportingMIMEType;
+							});
+							if (this.oReturnedDupFileInfo) {
+								this._showOverwriteMessage(sCurrentItemInputName);
 							} else {
+								this.oFileNameControl.setValue(sCurrentItemInputName);
 								this._closeDialog();
 							}
+						}.bind(this))
+						.catch(function (oError) {
+							this._closeDialog();
 						}.bind(this));
 					} else {
+						this.oFileNameControl.setValue(sCurrentItemInputName);
 						this._closeDialog();
 					}
 				}
@@ -1067,6 +1093,8 @@ sap.ui.define([
 		var oSelectedItem = this.oTableControl.getSelectedItem();
 		if (oSelectedItem) {
 			mParameters.selectedFiles.push(this._createSelectionParameter(oSelectedItem));
+		} else if (bReplaceExistingFile) {
+			mParameters.selectedFiles.push(this._createFileParameters(this.oReturnedDupFileInfo));
 		}
 
 		this.fireEvent("select", mParameters);
@@ -1077,6 +1105,23 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	CloudFilePicker.prototype._createFileParameters = function(oValue) {
+		var oCloudFileInfo = new CloudFileInfo();
+		oCloudFileInfo.setFileShareId(oValue.FileShare);
+		oCloudFileInfo.setFileShareItemId(oValue.FileShareItem);
+		oCloudFileInfo.setParentFileShareItemId(oValue.ParentFileShareItem);
+		oCloudFileInfo.setIsFolder(oValue.FileShareItemKind === "folder");
+		oCloudFileInfo.setFileShareItemName(oValue.FileShareItemName);
+		oCloudFileInfo.setCreatedByUser(oValue.CreatedByUser);
+		oCloudFileInfo.setCreationDateTime(oValue.CreationDateTime);
+		oCloudFileInfo.setLastChangedByUser(oValue.LastChangedByUser);
+		oCloudFileInfo.setLastChangeDateTime(oValue.LastChangeDateTime);
+		oCloudFileInfo.setFileShareItemContentType(oValue.FileShareItemContentType);
+		oCloudFileInfo.setFileShareItemContentSize(oValue.FileShareItemContentSize);
+		oCloudFileInfo.setFileShareItemContentLink(oValue.FileShareItemContentLink);
+		return oCloudFileInfo;
+	};
+
 	CloudFilePicker.prototype._createSelectionParameter = function (oSelectedItem, oContextBinding) {
 		var oCloudFileInfo = new CloudFileInfo();
 		var oContext;

package/src/sap/suite/ui/commons/MicroProcessFlow.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 *
 	 * @constructor
 	 * @public
@@ -101,7 +101,7 @@ sap.ui.define([
 
 			if (oMicroProcessFlow._hasScrolling()) {
 				oRM.openStart("div");
-				oRM.attr("tabindex", "0");
+				oRM.attr("tabindex", "-1");
 				oRM.attr("id", oMicroProcessFlow.getId() + "-leftscroller");
 				oRM.class("sapSuiteUiCommonsMicroProcessFlowScroller").class("sapSuiteUiCommonsMicroProcessFlowLeftScroller");
 				oRM.openEnd();
@@ -140,7 +140,7 @@ sap.ui.define([
 			if (oMicroProcessFlow._hasScrolling()) {
 				oRM.openStart("div");
 				oRM.attr("id", oMicroProcessFlow.getId() + "-rightscroller");
-				oRM.attr("tabindex", "0");
+				oRM.attr("tabindex", "-1");
 				oRM.class("sapSuiteUiCommonsMicroProcessFlowScroller").class("sapSuiteUiCommonsMicroProcessFlowRightScroller");
 				oRM.openEnd();
 				oRM.openStart("span");
@@ -446,7 +446,7 @@ sap.ui.define([
 	MicroProcessFlow.prototype._getLeftScroller = function () {
 		if (!this._oLeftScroller) {
 			this._oLeftScroller = new Icon(this.getId() + "leftscroller", {
-				src: "sap-icon://nav-back"
+				src: "sap-icon://navigation-left-arrow"
 			});
 			this._oLeftScroller.addStyleClass("sapSuiteUiCommonsMicroProcessFlowArrow");
 		}

package/src/sap/suite/ui/commons/MicroProcessFlowItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/suite/ui/commons/ProcessFlow.js

@@ -1263,7 +1263,7 @@ sap.ui.define([
      * @public
      */
 	ProcessFlow.prototype.destroyLanes = function () {
-		this.removeAllAggregation("lanes");
+		//this.removeAllAggregation("lanes");
 		for (var i = 0; i < this._internalLanes.length; i++) {
 			this._internalLanes[i].destroy();
 		}

package/src/sap/suite/ui/commons/ProcessFlowLaneHeader.js

@@ -503,6 +503,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @param {sap.ui.core.RenderManager} oRm the render manager into which the control will be rendered
+	 * @returns {Array<{state: sap.suites.ui.commons.ProcessFlowNodeState,value: number}>}The array of attribubtes each containing the state and value of the state as an integer
 	 * @since 1.22
 	 */
 	ProcessFlowLaneHeader.prototype._renderDonutPercentages = function(oRm) { // EXC_SAP_006_1

package/src/sap/suite/ui/commons/ProcessFlowNode.js

@@ -849,17 +849,17 @@ sap.ui.define([
 	 * Sets tag.
 	 *
 	 * @private
-	 * @param {object} newTag The new tag
+	 * @param {object<ProcessFlowNodeTag>} newTag The new tag is set for the ProcessFlowMode
 	 */
 	ProcessFlowNode.prototype._setTag = function (newTag) {
 		this._tag = newTag;
 	};
 
 	/**
-	 * Gets tag.
+	 * Gets tag of the ProcccesFlowNode.
 	 *
 	 * @private
-	 * @returns {object} The current tag
+	 * @returns {ProcessFlowNodeTag} The current tag of the ProcessFlowNode
 	 */
 	ProcessFlowNode.prototype._getTag = function () {
 		return this._tag;

package/src/sap/suite/ui/commons/ProcessFlowNodeRenderer.js

@@ -201,9 +201,6 @@ sap.ui.define([
 	 */
 	ProcessFlowNodeRenderer._assignNodeClasses = function (oRm, oControl, nodeLevel) { // EXC_SAP_006_1, EXC_JSHINT_047
 		switch (nodeLevel) {
-			case ProcessFlowNodeRenderer._nodeLevels.iLevel0:
-				//oRm.writeAttribute("id", oControl.getId() + "-base-container");
-				break;
 			case ProcessFlowNodeRenderer._nodeLevels.iLevel1:
 				oRm.attr("id", oControl.getId() + "-corner-container");
 				break;

package/src/sap/suite/ui/commons/Timeline.js

@@ -539,7 +539,19 @@ sap.ui.define([
 			}),
 			MonthDay: DateFormat.getDateInstance({
 				style: "medium"
-			})
+			}),
+			YearQuarter: DateFormat.getDateInstance({
+			pattern: "yyyy/QQ"
+			}),
+			YearMonth: DateFormat.getDateInstance({
+			pattern: "yyyy/MM"
+			}),
+			YearMonthWeek: DateFormat.getDateInstance({
+			pattern:  "yyyy/MM/w"
+			}),
+			YearMonthDay: DateFormat.getDateInstance({
+			pattern:  "yyyy/MM/dd"
+		})
 		};
 
 	/**
@@ -645,6 +657,10 @@ sap.ui.define([
 	 *
 	 * @param {function} fnGroupBy Grouping function.
 	 * @public
+	 * @returns {key: date|title :date|date :date} An object with three properties:
+	 * key: The key of the related group
+	 * title: The title of the related group
+	 * date: the date from the input
 	 */
 	Timeline.prototype.setCustomGrouping = function (fnGroupBy) {
 		var oBindingInfo = this.getBindingInfo("content");
@@ -864,17 +880,17 @@ sap.ui.define([
 		if (oDate instanceof Date) {
 			switch (sType) {
 				case TimelineGroupType.Year:
-					sKey = oDate.getFullYear();
+					sKey = DateFormats.Year.format(oDate);
 					sTitle = DateFormats.Year.format(oDate);
 					break;
 
 				case TimelineGroupType.Quarter:
-					sKey = oDate.getFullYear() + "/" + Math.floor(oDate.getMonth() / 4);
+					sKey = DateFormats.YearQuarter.format(oDate);
 					sTitle = DateFormats.Quarter.format(oDate);
 					break;
 
 				case TimelineGroupType.Month:
-					sKey = oDate.getFullYear() + "/" + oDate.getMonth();
+					sKey = DateFormats.YearMonth.format(oDate);
 					sTitle = DateFormats.Month.format(oDate);
 					break;
 
@@ -882,6 +898,7 @@ sap.ui.define([
 					var dateFrom = UI5Date.getInstance(oDate),
 						dateTo = UI5Date.getInstance(oDate),
 						year = oDate.getFullYear(),
+						month = oDate.getMonth(),
 						week = DateFormats.Week.format(oDate),
 						// find first and last day of the week
 						first = oDate.getDate() - oDate.getDay(),
@@ -889,13 +906,13 @@ sap.ui.define([
 						firstDay = UI5Date.getInstance(dateFrom.setDate(first)),
 						lastDay = UI5Date.getInstance(dateTo.setDate(last));
 
-					sKey = year + "/" + week;
+					sKey = DateFormats.YearMonthWeek.format(oDate);
 
 					sTitle = DateFormats.MonthDay.format(firstDay) + " \u2013 " + DateFormats.MonthDay.format(lastDay);
 					break;
 
 				case TimelineGroupType.Day:
-					sKey = oDate.getFullYear() + "/" + oDate.getMonth() + "/" + oDate.getDate();
+					sKey = DateFormats.YearMonthDay.format(oDate);
 					sTitle = DateFormats.Day.format(oDate);
 					break;
 
@@ -1199,8 +1216,8 @@ sap.ui.define([
 				} else {
 					this.aPrevFilters = aFilters.map(function (val) { return val; });
 					oBinding.filter(aFilters, FilterType.Control);
-				}
-			}
+				} 
+			} 
 		} else {
 			// for usecase without binding we just invalidate, because all filtering is done right before render is called
 			this.invalidate();

package/src/sap/suite/ui/commons/flexibility/changeHandler/PropertyChangeMapper.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @alias sap.suite.ui.commons.flexibility.changeHandler.PropertyChangeMapper
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.50
 	 * @private
 	 */

package/src/sap/suite/ui/commons/imageeditor/CropCustomShapeHistoryItem.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.imageeditor.HistoryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.67.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/imageeditor/CropEllipseHistoryItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.imageeditor.HistoryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.66.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/imageeditor/CropRectangleHistoryItem.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.imageeditor.HistoryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.66.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/imageeditor/CustomSizeItem.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.66.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/imageeditor/FilterHistoryItem.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.imageeditor.HistoryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.66.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/imageeditor/FlipHistoryItem.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.imageeditor.HistoryItem
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.66.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/imageeditor/HistoryItem.js

@@ -10,7 +10,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.66.0
 	 *
 	 * @abstract

package/src/sap/suite/ui/commons/imageeditor/ImageEditor.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.118.1
 	 * @since 1.66.0
 	 *
 	 * @constructor
@@ -87,7 +87,12 @@ sap.ui.define([
 				 <br>If set to <code>true</code>, the crop area is scaled up or down when the zoom level is changed.
 				 <br>If set to <code>false</code>, the crop area remains unchanged and keeps its size.
 				 */
-				scaleCropArea: {type: "boolean", defaultValue: false}
+				scaleCropArea: {type: "boolean", defaultValue: false},
+				/**
+				 * Defines the behaviour where if the property is set to true, the images are displayed as per the exif orientation
+				 * @since 1.118.0
+				 */
+				 useExifOrientation: {type: "boolean", defaultValue: false}
 			},
 			events: {
 				/**
@@ -251,14 +256,16 @@ sap.ui.define([
 
 	ImageEditor.prototype._getExifOrientation = function(oFile) {
 		var oFileReader = new FileReader(),
-			iOffset, oResult, oView, iLength, iMarker, iLittle, iTags, i, iError,
+			iOffset, oResult, oView, iLength, iMarker, iLittle, iTags, i, iValue, iError,
 			CONSTANTS = {
 				FIRST_CHECK: 65496,
-				SECOND_CHECK: 65505,
+				SECOND_CHECK: 9,
+				THIRD_CHECK: 65505,
 				CORRECT_FORMAT_CHECK: 1165519206,
 				LITTLE_CHECK: 18761,
 				FOURTH_CHECK: 65280,
 				EXIF_CHECK: 274,
+				ERR_GENERAL: -1,
 				ERR_FILE_FORMAT: -2,
 				OFFSET_STEP: 2, OFFSET_STEP_MED: 4, OFFSET_STEP_BIG: 6
 			};
@@ -273,45 +280,58 @@ sap.ui.define([
 				iError = 0;
 
 				try {
-					if (oView.getUint16(0, false) != CONSTANTS.FIRST_CHECK) {
-						return;
+					iValue = oView.getUint16(0, false);
+
+					if (iValue !== CONSTANTS.FIRST_CHECK) {
+						iError = CONSTANTS.ERR_FILE_FORMAT;
 					}
 
-					while (iOffset < iLength) {
+					while (!iError && iOffset <= iLength - 1) {
+						iValue = oView.getUint16(iOffset + CONSTANTS.OFFSET_STEP, false);
+
+						if (iValue < CONSTANTS.SECOND_CHECK) {
+							iError = CONSTANTS.ERR_GENERAL;
+							break;
+						}
+
 						iMarker = oView.getUint16(iOffset, false);
-						iOffset += CONSTANTS.OFFSET_STEP;
+						iOffset = iOffset + 2;
 
-						if (iMarker == CONSTANTS.SECOND_CHECK) {
-							iOffset += CONSTANTS.OFFSET_STEP;
+						if (iMarker === CONSTANTS.THIRD_CHECK) {
+							iValue = oView.getUint32(iOffset += CONSTANTS.OFFSET_STEP, false);
 
-							if (oView.getUint32(iOffset, false) != CONSTANTS.CORRECT_FORMAT_CHECK) {
-								return;
+							if (iValue !== CONSTANTS.CORRECT_FORMAT_CHECK) {
+								iError = CONSTANTS.ERR_GENERAL;
+								break;
 							}
 
-							iOffset += CONSTANTS.OFFSET_STEP_BIG;
-							iLittle = oView.getUint16(iOffset, false) == CONSTANTS.LITTLE_CHECK;
+							iLittle = oView.getUint16(iOffset += CONSTANTS.OFFSET_STEP_BIG, false) === CONSTANTS.LITTLE_CHECK;
 							iOffset += oView.getUint32(iOffset + CONSTANTS.OFFSET_STEP_MED, iLittle);
 							iTags = oView.getUint16(iOffset, iLittle);
-							iOffset += CONSTANTS.OFFSET_STEP;
+							iOffset += 2;
+
+							for (i = 0; i <= iTags - 1; i++) {
+								iValue = oView.getUint16(iOffset + (i * 12), iLittle);
 
-							for (i = 0; i < iTags; i++) {
-								if (oView.getUint16(iOffset + (i * 12), iLittle) == CONSTANTS.EXIF_CHECK) {
-									return oView.getUint16(iOffset + (i * 12) + 8, iLittle);
+								if (iValue === CONSTANTS.EXIF_CHECK) {
+									return resolve(oView.getUint16(iOffset + (i * 12) + 8, iLittle));
 								}
 							}
-						} else if ((iMarker & CONSTANTS.FOURTH_CHECK) != FOURTH_CHECK) {
+						} else if ((iMarker & CONSTANTS.FOURTH_CHECK) !== CONSTANTS.FOURTH_CHECK) {
+							iError = CONSTANTS.ERR_GENERAL;
 							break;
 						} else {
 							iOffset += oView.getUint16(iOffset, false);
 						}
 					}
+					return resolve(iError);
 				} catch (oErr) {
 					// probably wrong file format
 					return resolve(CONSTANTS.ERR_FILE_FORMAT);
 				}
 			};
 
-			oFileReader.readAsArrayBuffer(oFile.slice(0, 64 * 1024));
+			oFileReader.readAsArrayBuffer(oFile);
 		});
 	};
 
@@ -450,7 +470,9 @@ sap.ui.define([
 		if (typeof vSrc === "string") {
 			sSrc = vSrc;
 			this._oOriginalBlob = this._fetchUrlAsBlob(sSrc).then(function(oBlob) {
-				that._handleExifOrientation(oBlob);
+				if (that.getUseExifOrientation()) {
+					that._handleExifOrientation(oBlob);
+				}
 				that._oOriginalBlob = oBlob;
 				that._sOriginalFileType = oBlob.type;
 			});
@@ -463,8 +485,9 @@ sap.ui.define([
 			oUrl = window.URL;
 			sSrc = oUrl.createObjectURL(vSrc);
 			oUrl.revokeObjectURL(vSrc);
-			that._handleExifOrientation(vSrc);
-
+			if (this.getUseExifOrientation()) {
+				that._handleExifOrientation(vSrc);
+			}
 			this._oOriginalBlob = vSrc;
 			this._sOriginalFileType = vSrc.type;
 
@@ -1363,10 +1386,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns Blob object containing the image in the specified format. If the format is not specified, either the original format of the image is used or PNG, if the original format is not supported by the browser's <code>canvas.toDataURL</code> method.
-	 * @param {sap.suite.ui.commons.ImageFormat} [sFormat] File format of the returned image Blob. If the selected format is not suppoirted by the browser's <code>canvas.toDataURL</code> method, PNG is returned instead.
-	 * @param {float} [fQuality] Only applied when JPEG format is used. Quality of the returned image, ranging from 0 to 1. 0 means highly compressed image, 1 means uncompressed image. When no value is provided, canvas default compression level is used.
-	 * @return {Promise} Promise that resolves into the Blob object
+	 * Returns the blob object containing the image in a specified format. If the original format is not supported by the browser's <code>canvas.toDataURL</code> method, either the original format of the image is used or a PNG is used.
+	 * @param {sap.suite.ui.commons.ImageFormat} [sFormat] File format of the returned image blob. If the selected format is not supported by the browser's <code>canvas.toDataURL</code> method, PNG is returned instead.
+	 * @param {float} [fQuality] Only applied when JPEG format is used. Quality of the returned image, ranging from 0 to 1. 0 implies highly compressed image and 1 implies uncompressed image. When no value is provided, canvas default compression level is used.
+	 * @return {Promise<Blob>} Promise that resolves into the blob object
 	 * @public
 	 */
 	ImageEditor.prototype.getImageAsBlob = function(sFormat, fQuality) {