From 774fda3a7cf52aa3ff98ae6af9d16582996bd0d2 Mon Sep 17 00:00:00 2001
From: Nils Asmussen <nils@script-solution.de>
Date: Mon, 22 Aug 2016 22:18:19 +0200
Subject: [PATCH] Don't show context menu on finished multiselect.

Previously, we showed the context menu if a multiselect was finished
right away. Since we can select items individually now, it makes more
sense to just select the items as well and show the context menu later
via right mouse button or similar.

A multiselect can only add items to the selection, because that seems to
be easier to use. As before, shift+click can be used to deselect items.

The selection is cleared if the multiselect rectangle is empty and shift
is not pressed. This allows the user to click somewhere on the free area
to clear the selection again. If the shift key is pressed, it is not
cleared to prevent that a user triggers that by accident if he misses a
photo/album.
---
 src/scripts/multiselect.js | 45 ++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/scripts/multiselect.js b/src/scripts/multiselect.js
index 390e2be..ccfff75 100644
--- a/src/scripts/multiselect.js
+++ b/src/scripts/multiselect.js
@@ -42,6 +42,17 @@ multiselect.toggleItem = function(object, id) {
 
 }
 
+multiselect.addItem = function(object, id) {
+
+	let pos = $.inArray(id, multiselect.ids)
+
+	if (pos==-1) {
+		multiselect.ids.push(id)
+		multiselect.select(object)
+	}
+
+}
+
 multiselect.albumClick = function(e, albumObj) {
 
 	let id = albumObj.attr('data-id')
@@ -103,8 +114,6 @@ multiselect.show = function(e) {
 	if (visible.search())                           return false
 	if (visible.multiselect())                      $('#multiselect').remove()
 
-	multiselect.clearSelection()
-
 	sidebar.setSelectable(false)
 
 	multiselect.position.top    = e.pageY
@@ -226,6 +235,11 @@ multiselect.getSelection = function(e) {
 	if (visible.contextMenu())  return false
 	if (!visible.multiselect()) return false
 
+	if (!e.shiftKey && (size.width==0 || size.height==0)) {
+		multiselect.close()
+		return false
+	}
+
 	$('.photo, .album').each(function() {
 
 		let offset = $(this).offset()
@@ -235,22 +249,15 @@ multiselect.getSelection = function(e) {
 			(offset.top + 206)<=(size.top + size.height + tolerance) &&
 			(offset.left + 206)<=(size.left + size.width + tolerance)) {
 
-			let id = $(this).data('id')
-
-			if (id!=null && id!==0 && album.isSmartID(id)===false) {
-
-				ids.push(id)
-				multiselect.select(this)
-
-			}
+			let id = $(this).attr('data-id')
 
+			multiselect.addItem($(this), id)
+			
 		}
 
 	})
 
-	if (ids.length!==0 && visible.album())       contextMenu.photoMulti(ids, e)
-	else if (ids.length!==0 && visible.albums()) contextMenu.albumMulti(ids, e)
-	else                                         multiselect.close()
+	multiselect.hide()
 
 }
 
@@ -272,9 +279,7 @@ multiselect.deselect = function(id) {
 
 }
 
-multiselect.close = function() {
-
-	multiselect.clearSelection()
+multiselect.hide = function() {
 
 	sidebar.setSelectable(true)
 
@@ -288,4 +293,12 @@ multiselect.close = function() {
 	lychee.animate('#multiselect', 'fadeOut')
 	setTimeout(() => $('#multiselect').remove(), 300)
 
+}
+
+multiselect.close = function() {
+
+	multiselect.clearSelection()
+
+	multiselect.hide()
+
 }
\ No newline at end of file