diff --git a/apps/files/index.php b/apps/files/index.php index c3d74acc7e..4f103f975c 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -51,7 +51,6 @@ OCP\Util::addscript('files', 'search'); \OCP\Util::addScript('files', 'favoritesplugin'); \OC_Util::addVendorScript('core', 'handlebars/handlebars'); -\OC_Util::addVendorScript('core', 'backbone/backbone'); OCP\App::setActiveNavigationEntry('files_index'); diff --git a/lib/base.php b/lib/base.php index 299970e269..c0f3e50142 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 90d271b1d7..40fcc59f21 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 fd11080a59..1b22e03ca6 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'); - } } }