src/pyams_skin/resources/js/myams-core.js
changeset 486 48b7cea0d903
parent 470 1b985b52f866
child 536 d1742b03d5a7
--- a/src/pyams_skin/resources/js/myams-core.js	Wed Dec 12 10:13:00 2018 +0100
+++ b/src/pyams_skin/resources/js/myams-core.js	Wed Dec 12 10:13:38 2018 +0100
@@ -238,7 +238,9 @@
 	 * Copyright Andrew Davy: https://forrst.com/posts/Get_the_URL_of_the_current_javascript_file-Dst
 	 */
 	MyAMS.baseURL = (function () {
-		var script = $('script[src*="/myams.js"], script[src*="/myams.min.js"], script[src*="/myams-core.js"], script[src*="/myams-core.min.js"]');
+		var script = $('script[src*="/myams.js"], script[src*="/myams.min.js"], ' +
+					   'script[src*="/myams-core.js"], script[src*="/myams-core.min.js"], ' +
+					   'script[src*="/myams-require.js"], script[src*="/myams-require.min.js"]');
 		var src = script.attr("src");
 		ams.devmode = src.indexOf('.min.js') < 0;
 		ams.devext = ams.devmode ? '' : '.min';
@@ -397,9 +399,11 @@
 	 * @param url: script URL
 	 * @param callback: a callback to be called after script loading
 	 * @param options: a set of options to be added to AJAX call
+	 * @param onerror: an error callback to be called instead of generic callback
 	 */
-	MyAMS.getScript = function (url, callback, options) {
+	MyAMS.getScript = function (url, callback, options, onerror) {
 		if (typeof(callback) === 'object') {
+			onerror = options;
 			options = callback;
 			callback = null;
 		}
@@ -410,7 +414,7 @@
 			dataType: 'script',
 			url: ams.getSource(url),
 			success: callback,
-			error: ams.error.show,
+			error: onerror || ams.error.show,
 			cache: !ams.devmode,
 			async: options.async === undefined ? typeof(callback) === 'function' : options.async
 		};