diff options
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/core/js/js.js b/core/js/js.js index 370e68f5602..f6b446ea47e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -366,15 +366,30 @@ 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); + if(!OC.addScript.loaded[path]) { + if(ready) { + deferred = jQuery.ajax({ + url: path, + cache: true, + success: function (content) { + eval(content); + eval(ready); + }, + async: false + }); + } else { + deferred = jQuery.ajax({ + url: path, + cache: true, + success: function (content) { + eval(content); + }, + async: false + }); } - OC.addScript.loaded[path]=deferred; - }else{ - if(ready){ + OC.addScript.loaded[path] = deferred; + } else { + if (ready) { ready(); } } |