wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use eval instead of $.script

Browse source 
Fixes https://github.com/nextcloud/server/issues/4067

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Lukas Reschke 2017-03-26 14:11:58 +02:00
parent ec6853a2a6
commit 12a019d328
No known key found for this signature in database
GPG key ID: B9F6980CF6E759B1
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/js/js.js
View file

@ -366,15 +366,30 @@ var OCP = {},
*/ */
addScript:function(app,script,ready){ addScript:function(app,script,ready){
var deferred, path=OC.filePath(app,'js',script+'.js'); var deferred, path=OC.filePath(app,'js',script+'.js');
if(!OC.addScript.loaded[path]){ if(!OC.addScript.loaded[path]) {
if(ready){ if(ready) {
deferred=$.getScript(path,ready); deferred = jQuery.ajax({
}else{ url: path,
deferred=$.getScript(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; OC.addScript.loaded[path] = deferred;
}else{ } else {
if(ready){ if (ready) {
ready(); ready();
} }
} }