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

Removed select all

Browse Source 
Makes no sense anymore as albums can contain albums and photos and you can only select one type => Error when using select all
This commit is contained in:
Tobias Reich 2016-08-22 14:53:34 +02:00
parent 9d5e9a4137
commit e64e8ae621
3 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/Keyboard Shortcuts.md
View File

@ -14,8 +14,8 @@ The following keys and shortcuts can be used in Lychee.
| Key | Action | | Key | Action |
|:-----------|:------------| |:-----------|:------------|
| `s` or `f` | Search | | `s` or `f` | Search |
| `cmd`+`a` | Select all albums | | `shift`+`left-click` | Select album individually |
| `ctrl`+`a` | Select all albums | | `right-click` | Open context-menu |
### Album ### Album
| Key | Action | | Key | Action |
@ -25,8 +25,8 @@ The following keys and shortcuts can be used in Lychee.
| `i` | Show information | | `i` | Show information |
| `cmd`+`backspace` | Delete album | | `cmd`+`backspace` | Delete album |
| `ctrl`+`backspace` | Delete album | | `ctrl`+`backspace` | Delete album |
| `cmd`+`a` | Select all photos | | `shift`+`left-click` | Select album/photo individually |
| `ctrl`+`a` | Select all photos | | `right-click` | Open context-menu |
### Photo ### Photo
| Key | Action | | Key | Action |

4
src/scripts/init.js
View File

@ -55,10 +55,6 @@ $(document).ready(function() {
if (visible.photo() && basicModal.visible()===false) { photo.delete([photo.getID()]); return false } if (visible.photo() && basicModal.visible()===false) { photo.delete([photo.getID()]); return false }
else if (visible.album() && basicModal.visible()===false) { album.delete([album.getID()]); return false } else if (visible.album() && basicModal.visible()===false) { album.delete([album.getID()]); return false }
}) })
.bind([ 'command+a', 'ctrl+a' ], function() {
if (visible.album() && basicModal.visible()===false) { multiselect.selectAll(); return false }
else if (visible.albums() && basicModal.visible()===false) { multiselect.selectAll(); return false }
})
Mousetrap.bindGlobal('enter', function() { Mousetrap.bindGlobal('enter', function() {
if (basicModal.visible()===true) basicModal.action() if (basicModal.visible()===true) basicModal.action()

37
src/scripts/multiselect.js
View File

@ -120,43 +120,6 @@ multiselect.show = function(e) {
} }
multiselect.selectAll = function() {
if (lychee.publicMode) return false
if (visible.search()) return false
if (!visible.albums() && !visible.album) return false
if (visible.multiselect()) $('#multiselect').remove()
sidebar.setSelectable(false)
multiselect.position.top = 70
multiselect.position.right = 40
multiselect.position.bottom = 90
multiselect.position.left = 20
$('body').append(build.multiselect(multiselect.position.top, multiselect.position.left))
let documentSize = {
width : $(document).width(),
height : $(document).height()
}
let newSize = {
width : documentSize.width - multiselect.position.right + 2,
height : documentSize.height - multiselect.position.bottom
}
let e = {
pageX : documentSize.width - (multiselect.position.right / 2),
pageY : documentSize.height - multiselect.position.bottom
}
$('#multiselect').css(newSize)
multiselect.getSelection(e)
}
multiselect.resize = function(e) { multiselect.resize = function(e) {
if (multiselect.position.top === null || if (multiselect.position.top === null ||