diff options
author | Arthur Schiwon <blizzz@owncloud.com> | 2015-08-06 12:27:18 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@owncloud.com> | 2015-08-06 12:27:18 +0200 |
commit | ffaf5fed0e538bb140e45f345723131db3ec02f3 (patch) | |
tree | 6a2f2fcf5422233fcc3b65c2fc58596a7cd26bc7 /lib | |
parent | 67bb5712e4f1264003cd944e186d13a3c83908b8 (diff) | |
download | nextcloud-server-ffaf5fed0e538bb140e45f345723131db3ec02f3.tar.gz nextcloud-server-ffaf5fed0e538bb140e45f345723131db3ec02f3.zip |
load backbone universally
Diffstat (limited to 'lib')
-rw-r--r-- | lib/base.php | 2 | ||||
-rw-r--r-- | lib/private/share/share.php | 1 | ||||
-rw-r--r-- | lib/private/util.php | 5 |
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php index 299970e269c..c0f3e50142e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -407,6 +407,8 @@ class OC { OC_Util::addScript('mimetype'); OC_Util::addScript('mimetypelist'); OC_Util::addVendorScript('snapjs/dist/latest/snap'); + OC_Util::addVendorScript('core', 'backbone/backbone'); + OC_Util::addScript('oc-backbone'); // avatars if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) { diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 90d271b1d77..40fcc59f219 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -83,7 +83,6 @@ class Share extends Constants { ); if(count(self::$backendTypes) === 1) { \OC_Util::addScript('core', 'share'); - \OC_Util::addVendorScript('core', 'backbone/backbone'); \OC_Util::addStyle('core', 'share'); } return true; diff --git a/lib/private/util.php b/lib/private/util.php index fd11080a592..1b22e03ca6f 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -455,11 +455,6 @@ class OC_Util { $path = OC_Util::generatePath($application, 'vendor', $file); if (!in_array($path, self::$scripts)) { self::$scripts[] = $path; - if($file === 'backbone/backbone') { - // makes backbone available as OC.Backbone in order to avoid - // conflicts, because apps (like Mail) may bring own versions - OC_Util::addScript('oc-backbone'); - } } } |