diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-08-01 18:21:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 18:21:31 +0200 |
| commit | 32e5e48b0b5effe42ccc9d40388a26d4ba26ad18 (patch) | |
| tree | 66acb472d70ca79f1ced2043b229594302f319f3 /apps | |
| parent | 8a7d450fb5c80477e4414cfdf86b4737905cb8f3 (diff) | |
| parent | 217b52085d328386832b5e0253fe7ddb87d2cb6e (diff) | |
| download | nextcloud-server-32e5e48b0b5effe42ccc9d40388a26d4ba26ad18.tar.gz nextcloud-server-32e5e48b0b5effe42ccc9d40388a26d4ba26ad18.zip | |
Merge pull request #653 from nextcloud/animate-sidebar
slight animation for the sidebar for better feedback what happens
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 97fa9804a22..651ba6eef1e 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -2063,6 +2063,7 @@ describe('OCA.Files.FileList tests', function() { expect(fileList._detailsView.getFileInfo()).toEqual(null); }); it('closes sidebar whenever the currently highlighted file was removed from the list', function() { + jQuery.fx.off = true; var $tr = fileList.findFileEl('One.txt'); $tr.find('td.filename>a.name').click(); expect($tr.hasClass('highlighted')).toEqual(true); @@ -2072,6 +2073,7 @@ describe('OCA.Files.FileList tests', function() { expect($('#app-sidebar').hasClass('disappear')).toEqual(false); fileList.remove('One.txt'); expect($('#app-sidebar').hasClass('disappear')).toEqual(true); + jQuery.fx.off = false; }); it('returns the currently selected model instance when calling getModelForFile', function() { var $tr = fileList.findFileEl('One.txt'); @@ -2088,12 +2090,14 @@ describe('OCA.Files.FileList tests', function() { expect(model3).toEqual(model1); }); it('closes the sidebar when switching folders', function() { + jQuery.fx.off = true; var $tr = fileList.findFileEl('One.txt'); $tr.find('td.filename>a.name').click(); expect($('#app-sidebar').hasClass('disappear')).toEqual(false); fileList.changeDirectory('/another'); expect($('#app-sidebar').hasClass('disappear')).toEqual(true); + jQuery.fx.off = false; }); }); describe('File actions', function() { |