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

return the jQuery deferred object when using OC.loadScript

Browse source
This commit is contained in:
Robin Appelman 2012-08-29 01:57:35 +02:00
parent d786194ddc
commit 92c782c1b0
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/js/js.js
View file

@ -120,18 +120,19 @@ OC={
*/
addScript:function(app,script,ready){
var path=OC.filePath(app,'js',script+'.js');
if(OC.addScript.loaded.indexOf(path)==-1){
OC.addScript.loaded.push(path);
if(!OC.addScript.loaded[path]){
if(ready){
$.getScript(path,ready);
var deferred=$.getScript(path,ready);
}else{
$.getScript(path);
var deferred=$.getScript(path);
}
OC.addScript.loaded[path]=deferred;
}else{
if(ready){
ready();
}
}
return OC.addScript.loaded[path];
},
/**
* load a css file and load it