mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Use eval instead of $.script
This commit is contained in:
Morris Jobke 2017-03-26 15:13:03 -06:00 committed by GitHub
parent 3ba114dbbc 3c1d76c282
commit 96d4e1cab5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/js/js.js
View File

@ -366,15 +366,20 @@ 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){ deferred = jQuery.ajax({
deferred=$.getScript(path,ready); url: path,
}else{ cache: true,
deferred=$.getScript(path); success: function (content) {
} eval(content);
OC.addScript.loaded[path]=deferred; if(ready) {
}else{ ready();
if(ready){ }
}
});
OC.addScript.loaded[path] = deferred;
} else {
if (ready) {
ready(); ready();
} }
} }