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

Removed old visible.message()-function

Browse Source
This commit is contained in:
Tobias Reich 2015-07-12 14:47:55 +02:00
parent f26cb68787
commit 4d65819cd9
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/header.js
View File

@ -80,7 +80,7 @@ header.show = function() {
header.hide = function(e, delay = 500) {
if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && !visible.message()) {
if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && basicModal.visible()===false) {
clearTimeout($(window).data('timeout'))

8
src/scripts/init.js
View File

@ -52,12 +52,12 @@ $(document).ready(function() {
if (!visible.multiselect()) { sidebar.toggle(); return false }
})
.bind(['command+backspace', 'ctrl+backspace'], function() {
if (visible.photo() && !visible.message()) { photo.delete([photo.getID()]); return false }
else if (visible.album() && !visible.message()) { album.delete([album.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 }
})
.bind(['command+a', 'ctrl+a'], function() {
if (visible.album() && !visible.message()) { multiselect.selectAll(); return false }
else if (visible.albums() && !visible.message()) { multiselect.selectAll(); return false }
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() {

4
src/scripts/visible.js
View File

@ -41,10 +41,6 @@ visible.header = function() {
return true
}
visible.message = function() {
return basicModal.visible()
}
visible.contextMenu = function() {
return basicContext.visible()
}