merged master into typescript

2025-08-17 20:11:23 +02:00 · 2020-02-03 15:16:51 +00:00
parent 3f8bd1b494 e0f38dfb94
commit 2fc0666762
13 changed files with 1691 additions and 877 deletions
--- a/api/js/jsapi/egw.js
+++ b/api/js/jsapi/egw.js
@@ -440,7 +440,11 @@
 // get TypeScript modules working with our loader
 function require(_file)
 {
-	
+	switch(_file)
+	{
+		case 'jquery':	// cropper mistakes this for commonJS (typeof exports === 'object')
+			return window.jQuery;
+	}
 	return window.exports;
 }
 var exports = {};