Merge pull request #589 from owncloud/clear-search

Clear search on folder change

js/mail.js

@@ -641,6 +641,8 @@ var Mail = {
 		},
 
 		setFolderActive: function (accountId, folderId) {
+			Mail.State.messageView.clearFilter();
+
 			$('.mail_folders li')
 				.removeClass('active');
 			$('.mail_folders[data-account_id="' + accountId + '"] li[data-folder_id="' + folderId + '"]')

js/views/message.js

@@ -246,6 +246,12 @@ views.Messages = Backbone.Marionette.CompositeView.extend({
 		};
 		this.loadNew();
 	},
+
+	clearFilter: function() {
+		$('#searchbox').val('');
+		this.filterCriteria = null;
+	},
+
 	loadMessages: function(reload) {
 		reload = reload || false;
 		var from = this.collection.size();