@openui5/sap.m 1.120.6 → 1.121.0

package/src/sap/m/IconTabFilter.js

@@ -9,8 +9,9 @@ sap.ui.define([
 	"./library",
 	"./AccButton",
 	"./IconTabFilterExpandButtonBadge",
+	"sap/base/i18n/Localization",
+	"sap/ui/core/Lib",
 	"sap/ui/core/library",
-	"sap/ui/core/Core",
 	"sap/ui/core/Item",
 	"sap/ui/core/Renderer",
 	"sap/ui/core/IconPool",
@@ -22,12 +23,13 @@ sap.ui.define([
 	"sap/m/IconTabBarSelectList",
 	"sap/m/BadgeEnabler",
 	"sap/m/ImageHelper"
-], function (
+], function(
 	library,
 	AccButton,
 	IconTabFilterExpandButtonBadge,
+	Localization,
+	Library,
 	coreLibrary,
-	Core,
 	Item,
 	Renderer,
 	IconPool,
@@ -57,6 +59,9 @@ sap.ui.define([
 	// shortcut for sap.m.IconTabFilterDesign
 	var IconTabFilterDesign = library.IconTabFilterDesign;
 
+	// shortcut for sap.m.IconTabFilterDesign
+	var IconTabFilterInteractionMode = library.IconTabFilterInteractionMode;
+
 	// shortcut for sap.m.BadgeStyle
 	var BadgeStyle = library.BadgeStyle;
 
@@ -93,7 +98,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -158,7 +163,14 @@ sap.ui.define([
 			/**
 			 * Specifies whether the icon and the texts are placed vertically or horizontally.
 			 */
-			design : {type : "sap.m.IconTabFilterDesign", group : "Appearance", defaultValue : IconTabFilterDesign.Vertical}
+			design : {type : "sap.m.IconTabFilterDesign", group : "Appearance", defaultValue : IconTabFilterDesign.Vertical},
+
+			/**
+			 * Specifies the interaction mode.
+			 * @experimental Since 1.121.
+			 * Disclaimer: this property is in a beta state - incompatible API changes may be done before its official public release. Use at your own discretion.
+			 */
+			interactionMode : {type : "sap.m.IconTabFilterInteractionMode", group : "Behavior", defaultValue : IconTabFilterInteractionMode.Auto}
 		},
 		defaultAggregation : "content",
 		aggregations : {
@@ -198,7 +210,7 @@ sap.ui.define([
 	 *
 	 * @type {module:sap/base/i18n/ResourceBundle}
 	 */
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+	var oResourceBundle = Library.getResourceBundleFor("sap.m");
 
 	/**
 	 * Array of all available icon color CSS classes
@@ -436,7 +448,7 @@ sap.ui.define([
 			bInLine = oIconTabHeader._bInLine || oIconTabHeader.isInlineMode(),
 			bShowAll = this.getShowAll(),
 			sTextDir = this.getTextDirection(),
-			bIsUnselectable = oIconTabHeader._isUnselectable(this);
+			bIsSelectable = oIconTabHeader._isSelectable(this);
 
 		if (this._isOverflow()) {
 			mAriaParams.role = "button";
@@ -503,7 +515,7 @@ sap.ui.define([
 			oRM.class("sapMITBFilter" + sIconColor);
 		}
 
-		if (bIsUnselectable) {
+		if (!bIsSelectable) {
 			oRM.class("sapMITHUnselectable");
 		}
 
@@ -525,7 +537,7 @@ sap.ui.define([
 			oRM.attr("title", sTooltip);
 		}
 
-		if (this._isOverflow() || bIsUnselectable) {
+		if (this._isOverflow() || !bIsSelectable) {
 			oRM.attr("aria-haspopup", "menu");
 		}
 
@@ -615,7 +627,7 @@ sap.ui.define([
 				.text(oIconTabHeader._getDisplayText(this))
 				.close("span");
 
-			if (this._isOverflow() || this.getItems().length && bIsUnselectable) {
+			if (this._isOverflow() || this.getItems().length && !bIsSelectable) {
 				oRM.openStart("span", this.getId() + "-expandButton").class("sapMITHShowSubItemsIcon").openEnd();
 				oRM.icon(IconPool.getIconURI("slim-arrow-down"), null, {
 					"title": null,
@@ -634,7 +646,7 @@ sap.ui.define([
 		oRM.openStart("div").class("sapMITBContentArrow").openEnd().close("div");
 		oRM.close("div");
 
-		if (this.getItems().length && !bIsUnselectable) {
+		if (this.getItems().length && bIsSelectable) {
 
 			oRM.openStart("span").class("sapMITBFilterExpandBtnSeparator")
 				.accessibilityState({ role: "separator" })
@@ -696,7 +708,7 @@ sap.ui.define([
 			oRM.attr("title", sTooltip);
 		}
 
-		if (oIconTabHeader._isUnselectable(this)) {
+		if (!oIconTabHeader._isSelectable(this)) {
 			oRM.class("sapMITHUnselectable");
 		}
 
@@ -802,7 +814,7 @@ sap.ui.define([
 	IconTabFilter.prototype._renderText =  function (oRM) {
 		var sText = this.getText(),
 			sCount = this.getCount(),
-			bRTL = Core.getConfiguration().getRTL(),
+			bRTL = Localization.getRTL(),
 			sTextDir = this.getTextDirection();
 
 		oRM.openStart("span", this.getId() + "-text")
@@ -849,7 +861,7 @@ sap.ui.define([
 
 	/**
 	 * Sets the appropriate drag and drop event delegate
-	 * based on whether or not the IconTabFilter is unselectable.
+	 * based on whether or not the IconTabFilter is selectable.
 	 *
 	 * @private
 	 */
@@ -878,7 +890,7 @@ sap.ui.define([
 	/**
 	 * Returns the expand button for this instance.
 	 * This button is conditionally shown in the DOM
-	 * based on whether or not the IconTabFilter is unselectable.
+	 * based on whether or not the IconTabFilter is selectable.
 	 * @private
 	 */
 	IconTabFilter.prototype._getExpandButton = function () {

package/src/sap/m/IconTabFilterExpandButtonBadge.js

@@ -7,8 +7,8 @@
 sap.ui.define([
 	"./BadgeEnabler",
 	"sap/ui/core/Control",
-	"sap/ui/core/Core"
-], function (BadgeEnabler, Control, Core) {
+	"sap/ui/core/Lib"
+], function (BadgeEnabler, Control, Library) {
 	"use strict";
 
 	/**
@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @type {module:sap/base/i18n/ResourceBundle}
 	 */
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+	var oResourceBundle = Library.getResourceBundleFor("sap.m");
 
 	/**
 	 * Constructor for a new IconTabFilterExpandButtonBadge.
@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/IconTabHeader.js

@@ -8,12 +8,15 @@
 
 sap.ui.define([
 	'./library',
-	'sap/ui/core/Core',
+	"sap/base/i18n/Localization",
 	'sap/ui/core/Control',
+	"sap/ui/core/Element",
 	'sap/ui/core/EnabledPropagator',
+	"sap/ui/core/Lib",
 	'sap/ui/core/delegate/ItemNavigation',
 	"sap/ui/core/InvisibleText",
 	'sap/ui/core/ResizeHandler',
+	"sap/ui/core/Theming",
 	'sap/ui/Device',
 	'sap/m/Button',
 	'sap/m/IconTabFilter',
@@ -26,12 +29,15 @@ sap.ui.define([
 	"sap/ui/events/KeyCodes"
 ], function(
 	library,
-	Core,
+	Localization,
 	Control,
+	Element,
 	EnabledPropagator,
+	Library,
 	ItemNavigation,
 	InvisibleText,
 	ResizeHandler,
+	Theming,
 	Device,
 	Button,
 	IconTabFilter,
@@ -60,6 +66,8 @@ sap.ui.define([
 	// shortcut for sap.m.TabsOverflowMode
 	var TabsOverflowMode = library.TabsOverflowMode;
 
+	var IconTabFilterInteractionMode = library.IconTabFilterInteractionMode;
+
 	/**
 	 * Constructor for a new IconTabHeader.
 	 *
@@ -77,7 +85,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -270,7 +278,7 @@ sap.ui.define([
 	 *
 	 * @type {module:sap/base/i18n/ResourceBundle}
 	 */
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+	var oResourceBundle = Library.getResourceBundleFor("sap.m");
 
 	EnabledPropagator.apply(IconTabHeader.prototype, [true]);
 
@@ -281,6 +289,8 @@ sap.ui.define([
 		this._aTabKeys = [];
 		this._oAriaHeadText = null;
 		this._bIsRendered = false;
+		this._bThemeApplied = false;
+		this._handleThemeAppliedBound = this._handleThemeApplied.bind(this);
 	};
 
 	IconTabHeader.prototype.exit = function () {
@@ -322,7 +332,7 @@ sap.ui.define([
 
 		this._bIsRendered = false;
 
-		this._bRtl = Core.getConfiguration().getRTL();
+		this._bRtl = Localization.getRTL();
 
 		if (this._sResizeListenerId) {
 			ResizeHandler.deregister(this._sResizeListenerId);
@@ -342,10 +352,10 @@ sap.ui.define([
 			this.oSelectedItem._hideBadge();
 		}
 
-		if (Core.isThemeApplied()) {
+		if (this._bThemeApplied) {
 			this._setItemsForStrip();
 		} else {
-			Core.attachThemeChanged(this._handleThemeLoad, this);
+			Theming.attachApplied(this._handleThemeAppliedBound);
 		}
 
 		this._initItemNavigation();
@@ -548,7 +558,7 @@ sap.ui.define([
 			return this;
 		}
 
-		if (this._isUnselectable(oItem)) {
+		if (!this._isSelectable(oItem)) {
 			return this;
 		}
 
@@ -736,7 +746,7 @@ sap.ui.define([
 				this.$().addClass("sapUiSizeCompact");
 				break;
 			case  IconTabDensityMode.Inherit:
-				if (this.$().closest(".sapUiSizeCompact").length) {
+				if (this.getDomRef()?.closest(".sapUiSizeCompact")) {
 					this.$().addClass("sapUiSizeCompact");
 				}
 				break;
@@ -748,9 +758,10 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	IconTabHeader.prototype._handleThemeLoad = function () {
-		setTimeout(this._setItemsForStrip.bind(this), 350);
-		Core.detachThemeChanged(this._handleThemeLoad, this);
+	IconTabHeader.prototype._handleThemeApplied = function () {
+		this._bThemeApplied = true;
+		this._setItemsForStrip(this);
+		Theming.detachApplied(this._handleThemeAppliedBound);
 	};
 
 	/*
@@ -990,7 +1001,7 @@ sap.ui.define([
 	IconTabHeader.prototype._setItemsForStrip = function () {
 		var aTabFilters = this.getVisibleTabFilters();
 
-		if (!Core.isThemeApplied() || !aTabFilters.length) {
+		if (!this._bThemeApplied || !aTabFilters.length) {
 			return;
 		}
 
@@ -1330,10 +1341,10 @@ sap.ui.define([
 				if ($target.hasClass('sapMITBFilterIcon') || $target.hasClass('sapMITBCount') || $target.hasClass('sapMITBText') || $target.hasClass('sapMITBTab') || $target.hasClass('sapMITBContentArrow') || $target.hasClass('sapMITBSep') || $target.hasClass('sapMITBSepIcon')) {
 					// click on icon: fetch filter instead
 					sControlId = oEvent.srcControl.getId().replace(/-icon$/, "");
-					oControl = Core.byId(sControlId);
+					oControl = Element.getElementById(sControlId);
 					if (oControl.getMetadata().isInstanceOf("sap.m.IconTab") && !(oControl instanceof IconTabSeparator)) {
 
-						if (this._isUnselectable(oControl)) {
+						if (!this._isSelectable(oControl)) {
 							if (oControl.getItems().length || oControl._isOverflow()) {
 								oControl._expandButtonPress();
 							}
@@ -1350,7 +1361,7 @@ sap.ui.define([
 				} else if (oControl.getMetadata().isInstanceOf("sap.m.IconTab") && !(oControl instanceof IconTabSeparator)) {
 					// select item if it is an iconTab but not a separator
 
-					if (this._isUnselectable(oControl)) {
+					if (!this._isSelectable(oControl)) {
 						if (oControl.getItems().length || oControl._isOverflow()) {
 							oControl._expandButtonPress();
 						}
@@ -1368,7 +1379,7 @@ sap.ui.define([
 				//no target id, so we have to check if showAll is set or it's a text only item, because clicking on the number then also leads to selecting the item
 				if (oControl.getMetadata().isInstanceOf("sap.m.IconTab") && !(oControl instanceof IconTabSeparator)) {
 
-					if (this._isUnselectable(oControl)) {
+					if (!this._isSelectable(oControl)) {
 						if (oControl.getItems().length || oControl._isOverflow()) {
 							oControl._expandButtonPress();
 						}
@@ -1402,19 +1413,37 @@ sap.ui.define([
 	};
 
 	/**
-	 * Checks if a IconTabFilter is unable to be selected.
-	 * This instance of the IconTabHeader must be within an IconTabBar and the IconTabBar must have no content aggregation set.
-	 * The passed IconTabFilter instance must not be nested, has to have its items aggregation set and not have content aggregation set.
+	 * Checks if an IconTabFilter is selectable.
+	 * The automatic logic for not selectable (only one click area of the filter) is based on
+	 * when the instance of the IconTabHeader is placed within an IconTabBar and
+	 * the IconTabBar hasn't any content aggregation set.
+	 * The passed IconTabFilter instance isn't nested,
+	 * and has its items aggregation set, but doesn't have any content aggregation set.
 	 * @private
 	 * @param {sap.m.IconTabFilter} oIconTabFilter The instance to check
 	 * @returns {boolean}
 	 */
-	IconTabHeader.prototype._isUnselectable = function (oIconTabFilter) {
-		var oFilter = oIconTabFilter._getRealTab();
+	IconTabHeader.prototype._isSelectable = function (oIconTabFilter) {
+		var oFilter = oIconTabFilter._getRealTab(),
+		sFilterInteractionMode = oFilter.getInteractionMode();
+
+		if (!oFilter.getEnabled()) {
+			return false;
+		}
+
+		// If an item doesn't have children or it is an overflow, it is selectable
+		if (!oFilter.getItems().length || oFilter._isOverflow()) {
+			return true;
+		}
 
-		return !oFilter.getEnabled() || (this._isInsideIconTabBar() && !this.getParent().getContent().length &&
-			oFilter._getNestedLevel() === 1 && oFilter.getItems().length && !oFilter.getContent().length) ||
-			oFilter._isOverflow();
+		if (sFilterInteractionMode === IconTabFilterInteractionMode.Auto) {
+			return !this._isInsideIconTabBar() ||
+				oFilter._getNestedLevel() !== 1 ||
+				this.getParent().getContent().length ||
+				oFilter.getContent().length;
+		}
+
+		return sFilterInteractionMode === IconTabFilterInteractionMode.Select;
 	};
 
 	/**
@@ -1513,8 +1542,8 @@ sap.ui.define([
 			return;
 		}
 
-		// if candidate selected item is unselectable, instead select its first available child item that has content
-		if (this._isUnselectable(this.oSelectedItem)) {
+		// if candidate selected item is not selectable, instead select its first available child item that has content
+		if (!this._isSelectable(this.oSelectedItem)) {
 			this.setSelectedItem(this.oSelectedItem._getFirstAvailableSubFilter(), true);
 			return;
 		}
@@ -1631,7 +1660,11 @@ sap.ui.define([
 	IconTabHeader.prototype.ontouchstart = function(oEvent) {
 		var oTargetTouch = oEvent.targetTouches[0];
 		// store touch state
-		this._iActiveTouch = oTargetTouch.identifier;
+		if (oEvent.which === 3) { // when the event is a right-click
+			return;
+		} else {
+			this._iActiveTouch = oTargetTouch.identifier;
+		}
 	};
 
 	/**

package/src/sap/m/IconTabHeaderRenderer.js

@@ -6,12 +6,12 @@
 
 sap.ui.define([
 	'./library',
-	'sap/ui/core/Core',
-	'sap/ui/core/InvisibleText'],
+	'sap/ui/core/InvisibleText',
+	"sap/ui/core/Lib"],
 		function (
 			library,
-			Core,
-			InvisibleText) {
+			InvisibleText,
+			Library) {
 	"use strict";
 
 	/**
@@ -28,7 +28,7 @@ sap.ui.define([
 	IconTabHeaderRenderer.getInvisibleSplitTabDescriptionText = function() {
 		if (!this.oInvisibleSplitTabDescriptionText) {
 			this.oInvisibleSplitTabDescriptionText = new InvisibleText({
-				text: Core.getLibraryResourceBundle("sap.m").getText("ICONTABHEADER_SPLIT_TAB_DESCRIPTION")
+				text: Library.getResourceBundleFor("sap.m").getText("ICONTABHEADER_SPLIT_TAB_DESCRIPTION")
 			}).toStatic();
 		}
 

package/src/sap/m/IconTabSeparator.js

@@ -6,17 +6,17 @@
 
 // Provides control sap.m.IconTabSeparator.
 sap.ui.define([
-	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/core/Item",
 	"sap/m/IconTabFilter",
-	"sap/m/ImageHelper"
+	"sap/m/ImageHelper",
+	"sap/ui/core/Lib"
 ], function (
-	Core,
 	Element,
 	Item,
 	IconTabFilter,
-	ImageHelper
+	ImageHelper,
+	Library
 ) {
 	"use strict";
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -132,7 +132,7 @@ sap.ui.define([
 
 		var sIcon = this.getIcon(),
 			oIconTabHeader = this.getParent(),
-			oRB = Core.getLibraryResourceBundle('sap.m'),
+			oRB = Library.getResourceBundleFor('sap.m'),
 			mAriaParams = {};
 
 		if (sIcon) {
@@ -176,7 +176,7 @@ sap.ui.define([
 
 		var sIcon = this.getIcon(),
 			oIconTabHeader = oSelectList._oIconTabHeader,
-			oRB = Core.getLibraryResourceBundle('sap.m'),
+			oRB = Library.getResourceBundleFor('sap.m'),
 			mAriaParams = {};
 
 		if (sIcon) {

package/src/sap/m/IllustratedMessage.js

@@ -13,7 +13,8 @@ sap.ui.define([
 	"sap/m/Illustration",
 	"sap/base/Log",
 	"sap/ui/core/Control",
-	"sap/ui/core/Core",
+	"sap/ui/core/EventBus",
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
 	"sap/ui/core/ResizeHandler",
 	"sap/ui/thirdparty/jquery",
@@ -26,7 +27,8 @@ sap.ui.define([
 	Illustration,
 	Log,
 	Control,
-	Core,
+	EventBus,
+	Library,
 	coreLibrary,
 	ResizeHandler,
 	jQuery,
@@ -86,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -328,7 +330,7 @@ sap.ui.define([
 	IllustratedMessage.prototype.init = function () {
 		this._sLastKnownMedia = null;
 		this._updateInternalIllustrationSetAndType(this.getIllustrationType());
-		Core.getEventBus().subscribe("sapMIllusPool-assetLdgFailed", this._handleMissingAsset.bind(this));
+		EventBus.getInstance().subscribe("sapMIllusPool-assetLdgFailed", this._handleMissingAsset.bind(this));
 	};
 
 	IllustratedMessage.prototype.onBeforeRendering = function () {
@@ -347,7 +349,7 @@ sap.ui.define([
 		this._detachResizeHandlers();
 	};
 
-	/**
+	/*
 	 * GETTERS / SETTERS
 	 */
 
@@ -492,7 +494,7 @@ sap.ui.define([
 	};
 
 	IllustratedMessage.prototype._getResourceBundle = function () {
-		return Core.getLibraryResourceBundle("sap.m");
+		return Library.getResourceBundleFor("sap.m");
 	};
 
 	/**

package/src/sap/m/IllustratedMessageType.js

@@ -191,6 +191,12 @@ sap.ui.define([], function () {
 		 */
 		GroupTable: "sapIllus-GroupTable",
 
+		/**
+		 * "New Mail" illustration type.
+		 * @public
+		 */
+		NewMail: "sapIllus-NewMail",
+
 		/**
 		 * "No Filter Results" illustration type.
 		 * @public
@@ -227,6 +233,12 @@ sap.ui.define([], function () {
 		 */
 		SearchFolder: "sapIllus-SearchFolder",
 
+		/**
+		 * "Sign Out" illustration type.
+		 * @public
+		 */
+		SignOut: "sapIllus-SignOut",
+
 		/**
 		 * "Simple Balloon" illustration type.
 		 * @public

package/src/sap/m/Illustration.js

@@ -10,13 +10,13 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"./IllustrationRenderer",
 	"./IllustrationPool",
-	"sap/ui/core/Core"
+	"sap/ui/core/Theming"
 ], function(
 	Log,
 	Control,
 	IllustrationRenderer,
 	IllustrationPool,
-	Core
+	Theming
 ) {
 	"use strict";
 
@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -149,7 +149,7 @@ sap.ui.define([
 		var sMappedType = sType,
 			sPrefix = "",
 			oMetadata = IllustrationPool.getIllustrationSetMetadata(sSet),
-			sCurrentTheme = Core.getConfiguration().getTheme(),
+			sCurrentTheme = Theming.getTheme(),
 			sCollectionPath = oCollectionMap[sCurrentTheme];
 
 		if (

package/src/sap/m/IllustrationPool.js

@@ -6,11 +6,11 @@
 sap.ui.define([
 	"sap/base/Log",
 	"./library",
-	'sap/ui/core/Core',
+	"sap/ui/core/EventBus",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/StaticArea"
 ],
-	function(Log, mLibrary, Core, jQuery, StaticArea) {
+	function(Log, mLibrary, EventBus, jQuery, StaticArea) {
 		"use strict";
 
 		/**
@@ -373,7 +373,7 @@ sap.ui.define([
 					error: function (jqXHR, sStatus) {
 						if (sStatus !== "abort") { // log an error if it isn't aborted
 							delete oAssetRegistry[sRegistryKey];
-							Core.getEventBus().publish("sapMIllusPool-assetLdgFailed");
+							EventBus.getInstance().publish("sapMIllusPool-assetLdgFailed");
 							Log.error(sId + " asset could not be loaded");
 							fnResolve();
 						}

package/src/sap/m/Image.js

@@ -11,13 +11,14 @@ sap.ui.define([
 	'sap/ui/base/DataType',
 	'sap/base/security/URLListValidator',
 	'./ImageRenderer',
+	"sap/ui/core/Lib",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/thirdparty/jquery",
 	"sap/base/security/encodeCSS",
 	"sap/ui/Device",
 	"sap/ui/core/library"
 ],
-	function(library, Control, DataType, URLListValidator, ImageRenderer, KeyCodes, jQuery, encodeCSS, Device, coreLibrary) {
+	function(library, Control, DataType, URLListValidator, ImageRenderer, Library, KeyCodes, jQuery, encodeCSS, Device, coreLibrary) {
 	"use strict";
 
 
@@ -58,8 +59,10 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
 	 *
+	 * @borrows sap.ui.core.IFormContent.getFormDoNotAdjustWidth as #getFormDoNotAdjustWidth
+	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @alias sap.m.Image
@@ -871,7 +874,7 @@ sap.ui.define([
 
 		return {
 			role: bHasPressListeners ? "button" : "img",
-			type: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText(bHasPressListeners ? "ACC_CTR_TYPE_BUTTON" : "ACC_CTR_TYPE_IMAGE"),
+			type: Library.getResourceBundleFor("sap.m").getText(bHasPressListeners ? "ACC_CTR_TYPE_BUTTON" : "ACC_CTR_TYPE_IMAGE"),
 			description: this.getAlt() || this.getTooltip_AsString() || "",
 			focusable: bHasPressListeners
 		};

package/src/sap/m/ImageContent.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.38
 	 *
 	 * @public