summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-09-24 01:02:50 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-09-24 01:02:50 -0700
commit40871bab88159d914cfab2dd938a2312ed8eb1c1 (patch)
tree9f62a9fe1ee90d44d5d48e4147f57a5701bb87a1 /settings
parent759f732aaaea7eb2fcb57175514489631923b094 (diff)
parent45a7b0dbac307df9ea38a914fd3f1cfb9202a994 (diff)
downloadnextcloud-server-40871bab88159d914cfab2dd938a2312ed8eb1c1.tar.gz
nextcloud-server-40871bab88159d914cfab2dd938a2312ed8eb1c1.zip
Merge pull request #4930 from owncloud/fix-apps-settings
Fix the apps enabling/disabling in settings
Diffstat (limited to 'settings')
-rw-r--r--settings/js/apps.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 54810776d2b..a55c55e24cf 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -84,6 +84,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
else {
appitem.data('active',false);
+ element.data('active',false);
OC.Settings.Apps.removeNavigation(appid);
appitem.removeClass('active');
element.val(t('settings','Enable'));
@@ -104,6 +105,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
} else {
OC.Settings.Apps.addNavigation(appid);
appitem.data('active',true);
+ element.data('active',true);
appitem.addClass('active');
element.val(t('settings','Disable'));
}
@@ -158,7 +160,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
if(response.status === 'success'){
var navIds=response.nav_ids;
for(var i=0; i< navIds.length; i++){
- $('#apps').children('li[data-id="'+navIds[i]+'"]').remove();
+ $('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove();
}
}
});