[Pkg-owncloud-commits] [owncloud] 19/172: Clear selection on reload (when changing sort)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 61db16321f1bf7ceea22672b33cd165fc3620a4a
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue Apr 29 18:49:11 2014 +0200

    Clear selection on reload (when changing sort)
---
 apps/files/js/filelist.js           | 5 +++--
 apps/files/tests/js/filelistSpec.js | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 11d3354..2d3e96f 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -714,8 +714,6 @@ window.FileList = {
 				previousDir: currentDir
 			}
 		));
-		this._selectedFiles = {};
-		this._selectionSummary.clear();
 		this.reload();
 	},
 	linkTo: function(dir) {
@@ -776,6 +774,9 @@ window.FileList = {
 	 * @brief Reloads the file list using ajax call
 	 */
 	reload: function() {
+		this._selectedFiles = {};
+		this._selectionSummary.clear();
+		this.$el.find('#select_all').prop('checked', false);
 		FileList.showMask();
 		if (FileList._reloadCall) {
 			FileList._reloadCall.abort();
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 0c56e79..1a63980 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1421,6 +1421,12 @@ describe('FileList tests', function() {
 				});
 			});
 		});
+		it('resets the file selection on reload', function() {
+			FileList.$el.find('#select_all').click();
+			FileList.reload();
+			expect(FileList.$el.find('#select_all').prop('checked')).toEqual(false);
+			expect(FileList.getSelectedFiles()).toEqual([]);
+		});
 	});
 	describe('Sorting files', function() {
 		it('Sorts by name by default', function() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git