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

Removed duplicated timeout for header.

Browse Source 
Because of that, the timeout for going into fullscreen mode
has been changed from 500ms to 1s.
This commit is contained in:
Nils Asmussen 2016-08-06 15:19:55 +02:00
parent e41b0f81bd
commit 8181bd6ce6
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scripts/header.js
View File

@ -67,8 +67,6 @@ header.bind = function() {
header.show = function() { header.show = function() {
clearTimeout($(window).data('timeout'))
lychee.imageview.removeClass('full') lychee.imageview.removeClass('full')
header.dom().removeClass('header--hidden') header.dom().removeClass('header--hidden')
@ -76,19 +74,13 @@ header.show = function() {
} }
header.hide = function(e, delay = 500) { header.hide = function(e) {
if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && basicModal.visible()===false) { if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && basicModal.visible()===false) {
clearTimeout($(window).data('timeout'))
$(window).data('timeout', setTimeout(function() {
lychee.imageview.addClass('full') lychee.imageview.addClass('full')
header.dom().addClass('header--hidden') header.dom().addClass('header--hidden')
}, delay))
return true return true
} }

2
src/scripts/init.js
View File

@ -80,7 +80,7 @@ $(document).ready(function() {
// Fullscreen on mobile // Fullscreen on mobile
.on('touchend', '#imageview #image', function(e) { .on('touchend', '#imageview #image', function(e) {
if (swipe.obj==null || (swipe.offset>=-5&&swipe.offset<=5)) { if (swipe.obj==null || (swipe.offset>=-5&&swipe.offset<=5)) {
if (visible.header()) header.hide(e, 0) if (visible.header()) header.hide(e)
else header.show() else header.show()
} }
}) })

2
src/scripts/view.js
View File

@ -313,7 +313,7 @@ view.photo = {
$(document).bind('mousemove', function() { $(document).bind('mousemove', function() {
clearTimeout(timeout) clearTimeout(timeout)
header.show() header.show()
timeout = setTimeout(header.hide, 500) timeout = setTimeout(header.hide, 1000)
}) })
lychee.animate(lychee.imageview, 'fadeIn') lychee.animate(lychee.imageview, 'fadeIn')