From 92c782c1b049cbb4b9c8433edec2a08b739202a9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 29 Aug 2012 01:57:35 +0200
Subject: [PATCH] return the jQuery deferred object when using OC.loadScript
---
core/js/js.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/core/js/js.js b/core/js/js.js
index 0c842f0559..c38eebbff2 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -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
--
GitLab