From 6d4df5f6b7821003a4d18d3df385de389177182d Mon Sep 17 00:00:00 2001 From: Nils Asmussen Date: Thu, 28 Jul 2016 12:54:03 +0200 Subject: [PATCH] Introduced album.isSmartID. --- src/scripts/album.js | 8 +++++++- src/scripts/contextMenu.js | 2 +- src/scripts/multiselect.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/scripts/album.js b/src/scripts/album.js index 544eb25..ee93954 100644 --- a/src/scripts/album.js +++ b/src/scripts/album.js @@ -9,12 +9,18 @@ album = { } +album.isSmartID = function(id) { + + return id==='0' || id==='f' || id==='s' || id==='r' + +} + album.getID = function() { let id = null let isID = (id) => { - if (id==='0' || id==='f' || id==='s' || id==='r') return true + if (album.isSmartID(id)) return true return $.isNumeric(id) } diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js index 806487d..bc77423 100644 --- a/src/scripts/contextMenu.js +++ b/src/scripts/contextMenu.js @@ -47,7 +47,7 @@ contextMenu.album = function(albumID, e) { // fn must call basicContext.close() first, // in order to keep the selection - if (albumID==='0' || albumID==='f' || albumID==='s' || albumID==='r') return false + if (album.isSmartID(albumID)) return false // Show merge-item when there's more than one album let showMerge = (albums.json && albums.json.albums && Object.keys(albums.json.albums).length>1) diff --git a/src/scripts/multiselect.js b/src/scripts/multiselect.js index e9c60e2..a742734 100644 --- a/src/scripts/multiselect.js +++ b/src/scripts/multiselect.js @@ -199,7 +199,7 @@ multiselect.getSelection = function(e) { let id = $(this).data('id') - if (id!=='0' && id!==0 && id!=='f' && id!=='s' && id!=='r' && id!=null) { + if (!album.isSmartID(id) && id!=null) { ids.push(id) $(this).addClass('active')