diff options
Diffstat (limited to 'settings/src')
| -rw-r--r-- | settings/src/components/appDetails.vue | 2 | ||||
| -rw-r--r-- | settings/src/components/appList.vue | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/settings/src/components/appDetails.vue b/settings/src/components/appDetails.vue index ba48ea9391d..4aa39efc74b 100644 --- a/settings/src/components/appDetails.vue +++ b/settings/src/components/appDetails.vue @@ -48,7 +48,7 @@ <div class="actions"> <div class="actions-buttons"> <input v-if="app.update" class="update" type="button" :value="t('settings', 'Update to {version}', {version: app.update})" :disabled="installing || loading(app.id)"/> - <input v-if="app.canUnInstall" class="uninstall" type="button" :value="t('settings', 'Remove')" :disabled="installing || loading(app.id)"/> + <input v-if="app.canUnInstall" class="uninstall" type="button" :value="t('settings', 'Remove')" v-on:click="remove(app.id)" :disabled="installing || loading(app.id)"/> <input v-if="app.active" class="enable" type="button" :value="t('settings','Disable')" v-on:click="disable(app.id)" :disabled="installing || loading(app.id)" /> <input v-if="!app.active" class="enable" type="button" :value="enableButtonText" v-on:click="enable(app.id)" v-tooltip.auto="enableButtonTooltip" :disabled="!app.canInstall || installing || loading(app.id)" /> </div> diff --git a/settings/src/components/appList.vue b/settings/src/components/appList.vue index 74c04448f23..2a696bfdcdc 100644 --- a/settings/src/components/appList.vue +++ b/settings/src/components/appList.vue @@ -92,13 +92,9 @@ export default { let apps = this.$store.getters.getAllApps .filter(app => app.name.toLowerCase().search(this.search.toLowerCase()) !== -1) .sort(function (a, b) { - if (a.active !== b.active) { - return (a.active ? -1 : 1) - } - if (a.update !== b.update) { - return (a.update ? -1 : 1) - } - return OC.Util.naturalSortCompare(a.name, b.name); + const sortStringA = '' + (a.active ? 0 : 1) + (a.update ? 0 : 1) + a.name; + const sortStringB = '' + (b.active ? 0 : 1) + (b.update ? 0 : 1) + b.name; + return OC.Util.naturalSortCompare(sortStringA, sortStringB); }); if (this.category === 'installed') { |