Merge pull request #4068 from nextcloud/use-eval-instead-of-get-script

Use eval instead of $.script
9 years ago · 96d4e1cab5
parent 3ba114dbbc 3c1d76c282
commit 96d4e1cab5
1 changed files with 14 additions and 9 deletions
--- a/core/js/js.js
+++ b/core/js/js.js
@ -366,15 +366,20 @@ var OCP = {},
 	 */
 	addScript:function(app,script,ready){
 		var deferred, path=OC.filePath(app,'js',script+'.js');
-		if(!OC.addScript.loaded[path]){
-			if(ready){
-				deferred=$.getScript(path,ready);
-			}else{
-				deferred=$.getScript(path);
-			}
-			OC.addScript.loaded[path]=deferred;
-		}else{
-			if(ready){
+		if(!OC.addScript.loaded[path]) {
+			deferred = jQuery.ajax({
+				url: path,
+				cache: true,
+				success: function (content) {
+					eval(content);
+					if(ready) {
+						ready();
+					}
+				}
+			});
+			OC.addScript.loaded[path] = deferred;
+		} else {
+			if (ready) {
 				ready();
 			}
 		}