make sure jquery and common javascript is loaded before the javascript of the apps

This commit is contained in:
Robin Appelman 2011-07-31 02:24:46 +02:00
parent 0bc16683e5
commit 2c8b4da840
1 changed files with 7 additions and 7 deletions

View File

@ -92,6 +92,13 @@ if( !OC_Config::getValue( "installed", false )){
OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
// Add the stuff we need always
OC_Util::addScript( "jquery-1.6.2.min" );
OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
OC_Util::addScript( "js" );
OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
OC_Util::addStyle( "styles" );
// Load Apps
// This includes plugins for users and filesystems as well
if(!$error and !$RUNTIME_NOAPPS ){
@ -106,13 +113,6 @@ if(!$error and !$RUNTIME_NOSETUPFS ){
OC_Util::setupFS();
}
// Add the stuff we need always
OC_Util::addScript( "jquery-1.6.2.min" );
OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
OC_Util::addScript( "js" );
OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
OC_Util::addStyle( "styles" );
// FROM Connect.php
function OC_CONNECT_TEST($path,$user,$password){