arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only listen for mouseup event when multiselect in use

Browse Source
This commit is contained in:
Tobias Reich 2015-07-09 15:23:54 +02:00
parent 9a53ab5615
commit a2b5e48f6d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripts/multiselect.js
View File

@ -16,8 +16,7 @@ multiselect.position = {
multiselect.bind = function() { multiselect.bind = function() {
$('#content') .on('mousedown', (e) => { if (e.which===1) multiselect.show(e) }) $('#content').on('mousedown', (e) => { if (e.which===1) multiselect.show(e) })
$(document) .on('mouseup', (e) => { if (e.which===1) multiselect.getSelection(e) })
return true return true
@ -26,9 +25,9 @@ multiselect.bind = function() {
multiselect.show = function(e) { multiselect.show = function(e) {
if (lychee.publicMode) return false if (lychee.publicMode) return false
if (visible.search()) return false if (!visible.albums() && !visible.album()) return false
if (!visible.albums() && !visible.album) return false
if ($('.album:hover, .photo:hover').length!==0) return false if ($('.album:hover, .photo:hover').length!==0) return false
if (visible.search()) return false
if (visible.multiselect()) $('#multiselect').remove() if (visible.multiselect()) $('#multiselect').remove()
sidebar.setSelectable(false) sidebar.setSelectable(false)
@ -39,7 +38,10 @@ multiselect.show = function(e) {
multiselect.position.left = e.pageX multiselect.position.left = e.pageX
$('body').append(build.multiselect(multiselect.position.top, multiselect.position.left)) $('body').append(build.multiselect(multiselect.position.top, multiselect.position.left))
$(document).on('mousemove', multiselect.resize)
$(document)
.on('mousemove', multiselect.resize)
.on('mouseup', (e) => { if (e.which===1) multiselect.getSelection(e) })
} }
@ -157,7 +159,7 @@ multiselect.resize = function(e) {
multiselect.stopResize = function() { multiselect.stopResize = function() {
$(document).off('mousemove') $(document).off('mousemove mouseup')
} }