From 74c647bb6ae11f702908bcc308287a0f0fca497e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 3 Jun 2014 09:55:24 +0200 Subject: Do not overwrite cursor in sidebar --- apps/files/css/files.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files') diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 11cbc4b7f57..0a7b2b02d74 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -376,7 +376,7 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } padding: 28px 14px 19px !important; } -#fileList .action.action-share-notification span, img, a { +#fileList .action.action-share-notification span, #fileList a { cursor: default !important; } -- cgit v1.2.3 From 74e2a4b1548fd586977de47db84f61c4116e0323 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 3 Jun 2014 09:57:18 +0200 Subject: Use active instead of hover for active sidebar option Fix #8720 --- apps/files/js/navigation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files') diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js index c58a284e83f..b959e016e8c 100644 --- a/apps/files/js/navigation.js +++ b/apps/files/js/navigation.js @@ -82,13 +82,13 @@ } return; } - this.$el.find('li').removeClass('selected'); + this.$el.find('li').removeClass('active'); if (this.$currentContent) { this.$currentContent.addClass('hidden'); this.$currentContent.trigger(jQuery.Event('hide')); } this._activeItem = itemId; - this.$el.find('li[data-id=' + itemId + ']').addClass('selected'); + this.$el.find('li[data-id=' + itemId + ']').addClass('active'); this.$currentContent = $('#app-content-' + itemId); this.$currentContent.removeClass('hidden'); if (!options || !options.silent) { -- cgit v1.2.3 From 1d0ac9a2c58ea265ce587e3e72729516be63fc38 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 3 Jun 2014 11:45:53 +0200 Subject: Fix tests --- apps/files/tests/js/appSpec.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'apps/files') diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js index a9bbab03ecb..99a73d0b01d 100644 --- a/apps/files/tests/js/appSpec.js +++ b/apps/files/tests/js/appSpec.js @@ -200,31 +200,31 @@ describe('OCA.Files.App tests', function() { expect(App.navigation.getActiveItem()).toEqual('other'); expect($('#app-content-files').hasClass('hidden')).toEqual(true); expect($('#app-content-other').hasClass('hidden')).toEqual(false); - expect($('li[data-id=files]').hasClass('selected')).toEqual(false); - expect($('li[data-id=other]').hasClass('selected')).toEqual(true); + expect($('li[data-id=files]').hasClass('active')).toEqual(false); + expect($('li[data-id=other]').hasClass('active')).toEqual(true); App._onPopState({view: 'files', dir: '/somedir'}); expect(App.navigation.getActiveItem()).toEqual('files'); expect($('#app-content-files').hasClass('hidden')).toEqual(false); expect($('#app-content-other').hasClass('hidden')).toEqual(true); - expect($('li[data-id=files]').hasClass('selected')).toEqual(true); - expect($('li[data-id=other]').hasClass('selected')).toEqual(false); + expect($('li[data-id=files]').hasClass('active')).toEqual(true); + expect($('li[data-id=other]').hasClass('active')).toEqual(false); }); it('clicking on navigation switches the panel visibility', function() { $('li[data-id=other]>a').click(); expect(App.navigation.getActiveItem()).toEqual('other'); expect($('#app-content-files').hasClass('hidden')).toEqual(true); expect($('#app-content-other').hasClass('hidden')).toEqual(false); - expect($('li[data-id=files]').hasClass('selected')).toEqual(false); - expect($('li[data-id=other]').hasClass('selected')).toEqual(true); + expect($('li[data-id=files]').hasClass('active')).toEqual(false); + expect($('li[data-id=other]').hasClass('active')).toEqual(true); $('li[data-id=files]>a').click(); expect(App.navigation.getActiveItem()).toEqual('files'); expect($('#app-content-files').hasClass('hidden')).toEqual(false); expect($('#app-content-other').hasClass('hidden')).toEqual(true); - expect($('li[data-id=files]').hasClass('selected')).toEqual(true); - expect($('li[data-id=other]').hasClass('selected')).toEqual(false); + expect($('li[data-id=files]').hasClass('active')).toEqual(true); + expect($('li[data-id=other]').hasClass('active')).toEqual(false); }); it('clicking on navigation sends "show" and "urlChanged" event', function() { var handler = sinon.stub(); -- cgit v1.2.3