From bdd2aca6f2e2466cbfaec96a58008251125c6863 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 28 Aug 2016 12:59:16 +0200
Subject: [PATCH] Custom function to check if id is already selected

Replaces all hard-to-read $.inArray and -1 checks
---
 src/scripts/multiselect.js | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/scripts/multiselect.js b/src/scripts/multiselect.js
index 714004e..bdbf3c1 100644
--- a/src/scripts/multiselect.js
+++ b/src/scripts/multiselect.js
@@ -26,21 +26,30 @@ multiselect.bind = function() {
 
 }
 
-multiselect.toggleItem = function(object, id) {
+multiselect.isSelected = function(id) {
 
 	let pos = $.inArray(id, multiselect.ids)
 
-	if (pos===-1) multiselect.addItem(object, id)
-	else          multiselect.removeItem(object, id)
+	return {
+		selected : (pos===-1 ? false : true),
+		position : pos
+	}
 
 }
 
-multiselect.addItem = function(object, id) {
+multiselect.toggleItem = function(object, id) {
 
-	let pos = $.inArray(id, multiselect.ids)
+	let selected = multiselect.isSelected(id).selected
+
+	if (selected===false) multiselect.addItem(object, id)
+	else                  multiselect.removeItem(object, id)
+
+}
+
+multiselect.addItem = function(object, id) {
 
 	if (album.isSmartID(id)) return
-	if (pos!==-1) return
+	if (multiselect.isSelected(id).selected===true) return
 
 	multiselect.ids.push(id)
 	multiselect.select(object)
@@ -49,9 +58,9 @@ multiselect.addItem = function(object, id) {
 
 multiselect.removeItem = function(object, id) {
 
-	let pos = $.inArray(id, multiselect.ids)
+	let { selected, pos } = multiselect.isSelected(id)
 
-	if (pos===-1) return
+	if (selected===false) return
 
 	multiselect.ids.splice(pos, 1)
 	multiselect.deselect(object)
@@ -78,9 +87,10 @@ multiselect.photoClick = function(e, photoObj) {
 
 multiselect.albumContextMenu = function(e, albumObj) {
 
-	let id = albumObj.attr('data-id')
+	let id       = albumObj.attr('data-id')
+	let selected = multiselect.isSelected(id).selected
 
-	if ($.inArray(id, multiselect.ids)!=-1) {
+	if (selected===false) {
 		contextMenu.albumMulti(multiselect.ids, e)
 		multiselect.ids = []
 	} else {
@@ -92,9 +102,10 @@ multiselect.albumContextMenu = function(e, albumObj) {
 
 multiselect.photoContextMenu = function(e, photoObj) {
 
-	let id = photoObj.attr('data-id')
+	let id       = photoObj.attr('data-id')
+	let selected = multiselect.isSelected(id).selected
 
-	if ($.inArray(id, multiselect.ids)!=-1) {
+	if (selected===false) {
 		contextMenu.photoMulti(multiselect.ids, e)
 		multiselect.ids = []
 	} else {