@openui5/sap.ui.core 1.121.1 → 1.122.1

package/src/sap/ui/model/odata/v4/lib/_TreeState.js

@@ -22,18 +22,24 @@ sap.ui.define([
 	 * @private
 	 */
 	class _TreeState {
-		// maps node id to number of levels to expand
-		oExpandLevels = new Map();
+		// maps predicate to node id and number of levels to expand
+		mPredicate2ExpandLevels = {};
+
+		// @see #getOutOfPlaceGroupedByParent
+		mParentPredicate2OutOfPlace = {};
 
 		/**
 		 * Constructor for a new _TreeState.
 		 * The tree state is only kept if a <code>sNodeProperty</code> is given.
 		 *
 		 * @param {string} [sNodeProperty] - The path to the node id property
+		 * @param {function(object):string} fnGetKeyFilter
+		 *   A function to calculate a node's key filter
 		 *
 		 * @public
 		 */
-		constructor(sNodeProperty) {
+		constructor(sNodeProperty, fnGetKeyFilter) {
+			this.fnGetKeyFilter = fnGetKeyFilter;
 			this.sNodeProperty = sNodeProperty;
 		}
 
@@ -49,12 +55,14 @@ sap.ui.define([
 				return;
 			}
 
-			const sId = _Helper.drillDown(oNode, this.sNodeProperty);
-			const oExpandLevel = this.oExpandLevels.get(sId);
+			const sPredicate = _Helper.getPrivateAnnotation(oNode, "predicate");
+			const oExpandLevel = this.mPredicate2ExpandLevels[sPredicate];
 			if (oExpandLevel && oExpandLevel.Levels) {
-				this.oExpandLevels.delete(sId);
+				delete this.mPredicate2ExpandLevels[sPredicate];
 			} else {
-				this.oExpandLevels.set(sId, {NodeID : sId, Levels : 0});
+				// must have NodeId as the node may be missing when calling #getExpandLevels
+				const sNodeId = _Helper.drillDown(oNode, this.sNodeProperty);
+				this.mPredicate2ExpandLevels[sPredicate] = {NodeID : sNodeId, Levels : 0};
 			}
 		}
 
@@ -70,8 +78,8 @@ sap.ui.define([
 				return;
 			}
 
-			const sId = _Helper.drillDown(oNode, this.sNodeProperty);
-			this.oExpandLevels.delete(sId);
+			const sPredicate = _Helper.getPrivateAnnotation(oNode, "predicate");
+			delete this.mPredicate2ExpandLevels[sPredicate];
 		}
 
 		/**
@@ -86,12 +94,14 @@ sap.ui.define([
 				return;
 			}
 
-			const sId = _Helper.drillDown(oNode, this.sNodeProperty);
-			const oExpandLevel = this.oExpandLevels.get(sId);
+			const sPredicate = _Helper.getPrivateAnnotation(oNode, "predicate");
+			const oExpandLevel = this.mPredicate2ExpandLevels[sPredicate];
 			if (oExpandLevel && !oExpandLevel.Levels) {
-				this.oExpandLevels.delete(sId);
+				delete this.mPredicate2ExpandLevels[sPredicate];
 			} else {
-				this.oExpandLevels.set(sId, {NodeID : sId, Levels : 1});
+				// must have NodeId as the node may be missing when calling #getExpandLevels
+				const sNodeId = _Helper.drillDown(oNode, this.sNodeProperty);
+				this.mPredicate2ExpandLevels[sPredicate] = {NodeID : sNodeId, Levels : 1};
 			}
 		}
 
@@ -104,17 +114,69 @@ sap.ui.define([
 		 * @public
 		 */
 		getExpandLevels() {
-			const aExpandLevels = [...this.oExpandLevels.values()];
+			const aExpandLevels = Object.values(this.mPredicate2ExpandLevels);
 			return aExpandLevels.length ? JSON.stringify(aExpandLevels) : undefined;
 		}
 
+		/**
+		 * Returns information about the out-of-place nodes grouped by parent.
+		 *
+		 * @returns {Array<{nodeFilters : string[], nodePredicates : string[], parentFilter : string?, parentPredicate : string?}>}
+		 *   A list of out-of-place nodes grouped by parent. Each entry contains all out-of-place
+		 *   nodes for a parent (root nodes if parentFilter and parentPredicate are undefined) in
+		 *   the order in which they were created.
+		 *
+		 * @public
+		 */
+		getOutOfPlaceGroupedByParent() {
+			return Object.values(this.mParentPredicate2OutOfPlace);
+		}
+
+		/**
+		 * Returns the number of out-of-place nodes.
+		 * @returns {number} The number of out-of-place nodes
+		 *
+		 * @public
+		 */
+		getOutOfPlaceCount() {
+			return Object.values(this.mParentPredicate2OutOfPlace).reduce(
+				(iCount, oOutOfPlace) => iCount + oOutOfPlace.nodeFilters.length,
+			    0);
+		}
+
 		/**
 		 * Resets the tree state.
 		 *
 		 * @public
 		 */
 		reset() {
-			this.oExpandLevels.clear();
+			this.mPredicate2ExpandLevels = {};
+			this.mParentPredicate2OutOfPlace = {};
+		}
+
+		/**
+		 * Makes the node out of place.
+		 *
+		 * @param {object} oNode - The node
+		 * @param {object} [oParent] - The parent, unless the node is a root
+		 *
+		 * @public
+		 */
+		setOutOfPlace(oNode, oParent) {
+			const sParentPredicate = oParent && _Helper.getPrivateAnnotation(oParent, "predicate");
+			let oOutOfPlace = this.mParentPredicate2OutOfPlace[sParentPredicate];
+			if (!oOutOfPlace) {
+				this.mParentPredicate2OutOfPlace[sParentPredicate] = oOutOfPlace = {
+					nodeFilters : [],
+					nodePredicates : []
+				};
+				if (oParent) {
+					oOutOfPlace.parentFilter = this.fnGetKeyFilter(oParent);
+					oOutOfPlace.parentPredicate = sParentPredicate;
+				}
+			}
+			oOutOfPlace.nodeFilters.push(this.fnGetKeyFilter(oNode));
+			oOutOfPlace.nodePredicates.push(_Helper.getPrivateAnnotation(oNode, "predicate"));
 		}
 	}
 

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/Forma
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/String.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -137,6 +137,10 @@ sap.ui.define([
 			oFormatOptionsMerged = extend({}, this.oFormatOptions, oFormatArgs);
 		}
 
+		if (this.iScale >= 0) {
+			// ensures that amount scale wins over the decimals for the unit
+			oFormatOptionsMerged = extend({}, oFormatOptionsMerged, {maxFractionDigits: this.iScale});
+		}
 		// Only subclasses of the Unit type use a NumberFormat instance cache.
 		// By default a new NumberFormat instance is created everytime.
 		if (this.getMetadata().getClass() !== Unit) {
@@ -242,6 +246,25 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Gets the indices of the binding parts for which this type requires the binding's type for formatting or parsing.
+	 * If for example the type of the amount part is a {@link sap.ui.model.odata.type.Decimal} with a
+	 * <code>scale</scale> constraint less than the unit part's decimal places, then the amount's scale is
+	 * used.
+	 *
+	 * @returns {int[]}
+	 *   The indices of the parts with a relevant type for this composite type, or an empty array if
+	 *   the format option <code>showNumber</code> is falsy
+	 *
+	 * @override sap.ui.model.CompositeType#getPartsListeningToTypeChanges
+	 * @see #processPartTypes
+	 */
+	Unit.prototype.getPartsListeningToTypeChanges = function () {
+		// Only the first part is of interest because it may have a type with another scale than the
+		// decimal places for the unit part
+		return this.bShowNumber ? [0] : [];
+	};
+
 	/**
 	 * Parse a string value to an array containing measure and unit. Parsing of other
 	 * internal types than 'string' is not supported by the Unit type.
@@ -284,6 +307,20 @@ sap.ui.define([
 		return vResult;
 	};
 
+	/**
+	 * Processes the types of this composite type's parts. Remembers the <code>scale</code>
+	 * constraint of the amount part's type to consider it while formatting.
+	 *
+	 * @param {sap.ui.model.SimpleType[]} aPartTypes The types of the composite binding parts
+	 *
+	 * @override sap.ui.model.CompositeType#processPartTypes
+	 * @protected
+	 * @since 1.122.0
+	 */
+	Unit.prototype.processPartTypes = function (aPartTypes) {
+		this.iScale = aPartTypes[0]?.oConstraints?.scale;
+	};
+
 	Unit.prototype.validateValue = function(vValue) {
 		if (this.oConstraints) {
 			var oBundle = Library.getResourceBundleFor("sap.ui.core"),

package/src/sap/ui/model/xml/XMLListBinding.js

@@ -23,8 +23,11 @@ sap.ui.define([
 	 * @param {sap.ui.model.xml.XMLModel} oModel
 	 * @param {string} sPath
 	 * @param {sap.ui.model.Context} oContext
-	 * @param {sap.ui.model.Sorter|sap.ui.model.Sorter[]} [aSorters] initial sort order (can be either a sorter or an array of sorters)
-	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} [aFilters] predefined filter/s (can be either a filter or an array of filters)
+	 * @param {sap.ui.model.Sorter[]|sap.ui.model.Sorter} [aSorters=[]]
+	 *   The sorters used initially; call {@link #sort} to replace them
+	 * @param {sap.ui.model.Filter[]|sap.ui.model.Filter} [aFilters=[]]
+	 *   The filters to be used initially with type {@link sap.ui.model.FilterType.Application}; call {@link #filter} to
+	 *   replace them
 	 * @param {object} [mParameters]
 	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
 	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/model/xml/XMLTreeBinding.js

@@ -18,8 +18,12 @@ sap.ui.define(['sap/ui/model/ClientTreeBinding', "sap/base/util/each"],
 	 * @param {sap.ui.model.xml.XMLModel} [oModel]
 	 * @param {string} Path pointing to the tree or array that should be bound
 	 * @param {object} [oContext] Context object for this binding
-	 * @param {array} [aFilters] Predefined filters contained in an array
+	 * @param {sap.ui.model.Filter[]|sap.ui.model.Filter} [aFilters=[]]
+	 *   The filters to be used initially with type {@link sap.ui.model.FilterType.Application}; call {@link #filter} to
+	 *   replace them
 	 * @param {object} [mParameters] Additional model-specific parameters
+	 * @param {sap.ui.model.Sorter[]|sap.ui.model.Sorter} [aSorters=[]]
+	 *   The sorters used initially; call {@link #sort} to replace them
 	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
 	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in
 	 *   <code>aFilters</code> together with other filters

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/RecordReplay.js

@@ -196,6 +196,7 @@ sap.ui.define([
 	 */
 	RecordReplay.waitForUI5 = function (oOptions) {
 		oOptions = oOptions || {};
+		_autoWaiterAsync.resetConfig();
 		_autoWaiterAsync.extendConfig(oOptions);
 		return new Promise(function (resolve, reject) {
 			_autoWaiterAsync.waitAsync(function (sError) {

package/src/sap/ui/test/autowaiter/_autoWaiterAsync.js

@@ -23,10 +23,11 @@ sap.ui.define([
 	});
 	var bWaitStarted;
 	var sLastAutoWaiterLog;
-	var config = {
+	var defaultConfig = {
 		interval: 400, // milliseconds
 		timeout: 15000 // milliseconds
 	};
+	var config = extend({}, defaultConfig);
 
 	function extendConfig(oNewConfig) {
 		validateConfig(oNewConfig);
@@ -34,6 +35,11 @@ sap.ui.define([
 		_autoWaiter.extendConfig(config);
 	}
 
+	function resetConfig() {
+		config = extend({}, defaultConfig);
+		_autoWaiter.extendConfig(config);
+	}
+
 	function waitAsync(fnCallback) {
 		// start only one waiter at a time to prevent interference between the timeout detection of multiple waiters
 		if (bWaitStarted) {
@@ -89,6 +95,7 @@ sap.ui.define([
 
 	return {
 		extendConfig: extendConfig,
+		resetConfig: resetConfig,
 		waitAsync: waitAsync
 	};
 }, true);

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/test/gherkin/opa5TestHarness.js

@@ -7,12 +7,6 @@
 /* global QUnit */
 /* eslint-disable no-eval */
 
-// Load synchronously to avoid QUnit issue where tests run before QUnit is loaded
-// Only load QUnit if it has not been loaded via script tag
-if (!window.QUnit || !window.QUnit.test) {
-	sap.ui.requireSync("sap/ui/thirdparty/qunit"); // legacy-relevant - sync fallback when caller did not load QUnit
-}
-
 // put qunit-coverage last so library files don't get measured
 sap.ui.define([
 	"sap/base/Log",

package/src/sap/ui/test/gherkin/qUnitTestHarness.js

@@ -6,12 +6,6 @@
 
 /* global QUnit */
 
-// Load synchronously to avoid QUnit issue where tests run before QUnit is loaded
-// Only load QUnit if it has not been loaded via script tag
-if (!window.QUnit || !window.QUnit.test) {
-	sap.ui.requireSync("sap/ui/thirdparty/qunit"); // legacy-relevant - sync fallback when caller did not load QUnit
-}
-
 // put qunit-coverage last so library files don't get measured  (we load StepDefinitions, even though we don't have to,
 // so that it doesn't appear in the code coverage list, knowing that the user will need to load it)
 sap.ui.define([

package/src/sap/ui/test/qunitPause.js

@@ -251,5 +251,9 @@
 	};
 
 	setupBeforeQUnit();
-	sap.ui.define("sap/ui/test/qunitPause", [], qunitPause, true);
+	sap.ui.loader._.defineModuleSync("sap/ui/test/qunitPause.js", qunitPause);
+	/** @deprecated */
+	sap.ui.test ??= {};
+	/** @deprecated */
+	sap.ui.test.qunitPause = qunitPause;
 }());

package/src/sap/ui/util/Storage.js

@@ -277,7 +277,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.121.1
+	 * @version 1.122.1
 	 */
 	Storage.Type = {
 		/**

package/src/sap/ui/util/_enforceNoReturnValue.js

@@ -0,0 +1,26 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+	"sap/base/future",
+	"sap/base/Log"
+], function(future, Log) {
+	"use strict";
+
+	function _enforceNoReturnValue(vResult, mLogInfo) {
+		if (vResult !== undefined) {
+			const sFunctionName = mLogInfo.name ? `'${mLogInfo.name}' ` : '';
+			// @deprecated
+			if (typeof vResult.then === "function") {
+				vResult.catch((err) => {
+					Log.error(`The registered Event Listener ${sFunctionName}of '${mLogInfo.component}' failed.`, err);
+				});
+			}
+			// for any return value other than 'undefined'
+			future.fatalThrows(`The registered Event Listener ${sFunctionName}must not have a return value.`, mLogInfo.component);
+		}
+	}
+	return _enforceNoReturnValue;
+});

package/src/ui5loader.js

@@ -270,6 +270,28 @@
 	 */
 	let fnIgnorePreload;
 
+	/**
+	 * Whether the loader should try to load the debug variant
+	 * of a module.
+	 * This takes the standard and partial debug mode into account.
+	 *
+	 * @param {string} sModuleName Name of the module to be loaded
+	 * @returns {boolean} Whether the debug variant should be loaded
+	 */
+	function shouldLoadDebugVariant(sModuleName) {
+		if (fnIgnorePreload) {
+			// if preload is ignored (= partial debug mode), load the debug module first
+			if (fnIgnorePreload(sModuleName)) {
+				return true;
+			} else {
+				// partial debug mode is active, but not for this module
+				return false;
+			}
+		} else {
+			// no debug mode or standard debug mode
+			return bDebugSources;
+		}
+	}
 
 	// ---- internal state ------------------------------------------------------------------------
 
@@ -1635,7 +1657,8 @@
 		oModule.async = bAsync;
 
 		// if debug is enabled, try to load debug module first
-		const aExtensions = bDebugSources ? ["-dbg", ""] : [""];
+		const aExtensions = shouldLoadDebugVariant(sModuleName) ? ["-dbg", ""] : [""];
+
 		if ( !bAsync ) {
 
 			for (let i = 0; i < aExtensions.length && oModule.state !== LOADED; i++) {
@@ -1680,7 +1703,7 @@
 
 			oModule.url = getResourcePath(oSplitName.baseID, aExtensions[0] + oSplitName.subType);
 			// in debug mode, fall back to the non-dbg source, otherwise try the same source again (for SSO re-connect)
-			const sAltUrl = bDebugSources ? getResourcePath(oSplitName.baseID, aExtensions[1] + oSplitName.subType) : oModule.url;
+			const sAltUrl = aExtensions.length === 2 ? getResourcePath(oSplitName.baseID, aExtensions[1] + oSplitName.subType) : oModule.url;
 
 			if ( log.isLoggable() ) {
 				log.debug(sLogPrefix + "loading '" + sModuleName + "' from '" + oModule.url + "' (using <script>)");