diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-10-15 16:15:42 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-10-26 16:15:14 +0100 |
| commit | a9a6d4c1826c7d1c1d11af9af349b67ba5af4923 (patch) | |
| tree | fd41f5ae658f5666166f569adec6508057f30e41 /settings/js | |
| parent | 5181e5c29a1037137e8435c46c3a9075fe858a21 (diff) | |
| download | nextcloud-server-a9a6d4c1826c7d1c1d11af9af349b67ba5af4923.tar.gz nextcloud-server-a9a6d4c1826c7d1c1d11af9af349b67ba5af4923.zip | |
Stay on the same category when refreshing the page on the apps list
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/apps.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 987153b778c..bb3b1b85c3b 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -40,7 +40,8 @@ OC.Settings.Apps = OC.Settings.Apps || { } var categories = [ - {displayName: 'Enabled', id: '0'} + {displayName: t('settings', 'Enabled'), id: '0'}, + {displayName: t('settings', 'Not enabled'), id: '1'} ]; var source = $("#categories-template").html(); @@ -48,7 +49,7 @@ OC.Settings.Apps = OC.Settings.Apps || { var html = template(categories); $('#apps-categories').html(html); - OC.Settings.Apps.loadCategory(0); + OC.Settings.Apps.loadCategory(parseInt($('#app-navigation').attr('data-category'), 10)); this._loadCategoriesCall = $.ajax(OC.generateUrl('settings/apps/categories'), { data:{}, @@ -398,14 +399,14 @@ OC.Settings.Apps = OC.Settings.Apps || { .text(''); }, - showReloadMessage: function(appId) { + showReloadMessage: function() { OC.dialogs.info( t( 'settings', 'The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.' ), t('settings','App update'), - function (result) { + function () { window.location.reload(); }, true @@ -443,6 +444,7 @@ OC.Settings.Apps = OC.Settings.Apps || { $(document).on('click', 'ul#apps-categories li', function () { var categoryId = $(this).data('categoryId'); OC.Settings.Apps.loadCategory(categoryId); + OC.Util.History.pushState('category=' + categoryId); }); $(document).on('click', '.app-description-toggle-show', function () { @@ -508,7 +510,7 @@ OC.Settings.Apps = OC.Settings.Apps || { }); $(document).on('click', '#enable-experimental-apps', function () { - var state = $(this).prop('checked') + var state = $(this).prop('checked'); $.ajax(OC.generateUrl('settings/apps/experimental'), { data: {state: state}, type: 'POST', |