summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2014-07-05 13:39:25 +0200
committerGeorg Ehrke <developer@georgehrke.com>2014-07-05 13:39:25 +0200
commit485be909ff10d151fd5ddfe8e0709f50db611882 (patch)
tree495fc7ffd7b519d9ee19bfc5f0c70aee03a28b9e /settings/js
parent2327d41b11e11ca0553c829b5d7adeb0f000a474 (diff)
downloadnextcloud-server-485be909ff10d151fd5ddfe8e0709f50db611882.tar.gz
nextcloud-server-485be909ff10d151fd5ddfe8e0709f50db611882.zip
improvements for uninstall button
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/apps.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 4cd7520caa7..3f9a9eab17a 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -84,12 +84,12 @@ OC.Settings.Apps = OC.Settings.Apps || {
page.find('input.update').hide();
}
- if (app.removable !== false) {
- page.find('input.uninstall').show();
- page.find('input.uninstall').data('appid', app.id);
- page.find('input.uninstall').attr('value', t('settings', 'Uninstall App'));
+ if (app.removable !== false && app.active === false) {
+ page.find('a.uninstall').show();
+ page.find('a.uninstall').data('appid', app.id);
+ page.find('a.uninstall').attr('value', t('settings', 'Uninstall App'));
} else {
- page.find('input.uninstall').hide();
+ page.find('a.uninstall').hide();
}
page.find('input.enable').show();
@@ -371,7 +371,7 @@ $(document).ready(function(){
OC.Settings.Apps.updateApp(appid, element);
}
});
- $('#app-content input.uninstall').click(function(){
+ $('#app-content a.uninstall').click(function(){
var element = $(this);
var appid=$(this).data('appid');
if(appid) {