diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-10-14 21:17:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 21:17:43 +0200 |
| commit | 82a5833217d8fb1a74e7838b3e2ccf2cb9e1b90c (patch) | |
| tree | 2f64bf10686fbdb8f2be0d6b0acd6a7f2b07f162 /core/js/js.js | |
| parent | 0fca815b4dd601381a909656a1e3e7a7e89714d2 (diff) | |
| parent | 056a74e3230071191fc0c19cfb8c17d2f8c8ab12 (diff) | |
| download | nextcloud-server-82a5833217d8fb1a74e7838b3e2ccf2cb9e1b90c.tar.gz nextcloud-server-82a5833217d8fb1a74e7838b3e2ccf2cb9e1b90c.zip | |
Merge pull request #11028 from nextcloud/feature/no_eval_csp
Move to stricter CSP
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/js/js.js b/core/js/js.js index d78b0159cfa..12c47d546c1 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -368,15 +368,9 @@ var OCP = {}, addScript:function(app,script,ready){ var deferred, path=OC.filePath(app,'js',script+'.js'); if(!OC.addScript.loaded[path]) { - deferred = jQuery.ajax({ - url: path, - cache: true, - success: function (content) { - window.eval(content); - if(ready) { - ready(); - } - } + deferred = $.Deferred(); + $.getScript(path, function() { + deferred.resolve(); }); OC.addScript.loaded[path] = deferred; } else { |