From: David Prévot Date: Wed, 6 Nov 2013 00:39:36 +0000 (-0400) Subject: Adapt chosen (css) path X-Git-Tag: v7.0.0alpha2~343^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eebb756c3814ec481d2fad0734800ebbd3621769;p=nextcloud-server.git Adapt chosen (css) path Avoid shipping duplicate files in 3rdparty/css. 3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png so its useless to duplicate them in 3rdparty/css. Taking the same approach as in apps/calendar/appinfo/app.php and apps/files_external/settings.php. --- diff --git a/settings/personal.php b/settings/personal.php index be1aa6400bf..0da14a8c8c4 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -15,7 +15,7 @@ OC_Util::addStyle( 'settings', 'settings' ); OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' ); OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' ); OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); -OC_Util::addStyle( '3rdparty', 'chosen' ); +OC_Util::addStyle( '3rdparty', 'chosen/chosen' ); \OC_Util::addScript('files', 'jquery.fileupload'); if (\OC_Config::getValue('enable_avatars', true) === true) { \OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');