diff options
| author | Jakob Sack <mail@jakobsack.de> | 2012-08-10 13:00:51 +0200 |
|---|---|---|
| committer | Jakob Sack <mail@jakobsack.de> | 2012-08-10 13:00:51 +0200 |
| commit | 81b997b56ef130111b527e5b40f5d3348f30aecc (patch) | |
| tree | 645feaefbe5ef6d00d725259f284e329f3121feb /lib/base.php | |
| parent | 82b10954e714135aac332c4e349124731841aa90 (diff) | |
| parent | 9ad31e5f81ad5ec899101a67451843dd8f080340 (diff) | |
| download | nextcloud-server-81b997b56ef130111b527e5b40f5d3348f30aecc.tar.gz nextcloud-server-81b997b56ef130111b527e5b40f5d3348f30aecc.zip | |
Merge branch 'backgroundjobs'
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index c4127c73f26..dae62a029c8 100644 --- a/lib/base.php +++ b/lib/base.php @@ -241,11 +241,17 @@ class OC{ OC_Util::addScript( "jquery.infieldlabel.min" ); OC_Util::addScript( "jquery-tipsy" ); OC_Util::addScript( "oc-dialogs" ); + OC_Util::addScript( "backgroundjobs" ); OC_Util::addScript( "js" ); OC_Util::addScript( "eventsource" ); OC_Util::addScript( "config" ); //OC_Util::addScript( "multiselect" ); OC_Util::addScript('search','result'); + + if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){ + OC_Util::addScript( 'backgroundjobs' ); + } + OC_Util::addStyle( "styles" ); OC_Util::addStyle( "multiselect" ); OC_Util::addStyle( "jquery-ui-1.8.16.custom" ); |