Fixed file actions menu to close when reclicking trigger

FileActionsMenu is now a backbone view.
The trigger and highlight handling is now done in the
FileActions.showMenu() method using events.

1 files changed, 20 insertions, 4 deletions

diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index 8c43b917fa9..236cff6cafd 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -192,10 +192,26 @@ describe('OCA.Files.FileActions tests', function() {
 			context = actionStub.getCall(0).args[1];
 			expect(context.dir).toEqual('/somepath');
 		});
-		it('shows actions menu when clicking the menu trigger', function() {
-			expect($tr.find('.menu').length).toEqual(0);
-			$tr.find('.action-menu').click();
-			expect($tr.find('.menu').length).toEqual(1);
+		describe('actions menu', function() {
+			it('shows actions menu inside row when clicking the menu trigger', function() {
+				expect($tr.find('td.filename .fileActionsMenu').length).toEqual(0);
+				$tr.find('.action-menu').click();
+				expect($tr.find('td.filename .fileActionsMenu').length).toEqual(1);
+			});
+			it('shows highlight on current row', function() {
+				$tr.find('.action-menu').click();
+				expect($tr.hasClass('mouseOver')).toEqual(true);
+			});
+			it('cleans up after hiding', function() {
+				var clock = sinon.useFakeTimers();
+				$tr.find('.action-menu').click();
+				expect($tr.find('.fileActionsMenu').length).toEqual(1);
+				OC.hideMenus();
+				// sliding animation
+				clock.tick(500);
+				expect($tr.hasClass('mouseOver')).toEqual(false);
+				expect($tr.find('.fileActionsMenu').length).toEqual(0);
+			});
 		});
 	});
 	describe('custom rendering', function() {