From e54054cf8f83a5365872485ce523348e08dadb07 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Thu, 9 Oct 2014 21:53:32 -0700 Subject: [PATCH] "Restart when Opened" option (see #159) --- src/General/Config.coffee | 4 ++++ src/Images/ImageExpand.coffee | 4 ++-- src/Images/ImageHover.coffee | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 5a430716b..46adfc04e 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -211,6 +211,10 @@ Config = true 'Videos begin playing immediately when opened.' ] + 'Restart when Opened': [ + true + 'Restart GIFs and WebMs when you hover over or expand them.' + ] 'Show Controls': [ true 'Show controls on videos expanded inline. Turn this off if you want to contract videos by clicking on them.' diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 0766b7d1b..69e202822 100755 --- a/src/Images/ImageExpand.coffee +++ b/src/Images/ImageExpand.coffee @@ -140,7 +140,7 @@ ImageExpand = el.pause() for eventName, cb of ImageExpand.videoCB $.off el, eventName, cb - ImageCommon.rewind file.thumb + ImageCommon.rewind file.thumb if Conf['Restart when Opened'] delete file.fullImage $.queueTask -> # XXX Work around Chrome/Chromium not firing mouseover on the thumbnail. @@ -163,7 +163,7 @@ ImageExpand = else if ImageCommon.cache?.dataset.fullID is post.fullID el = file.fullImage = ImageCommon.popCache() $.on el, 'error', ImageExpand.error - ImageCommon.rewind el unless el.id is 'ihover' + ImageCommon.rewind el if Conf['Restart when Opened'] and el.id isnt 'ihover' el.removeAttribute 'id' else el = file.fullImage = $.el (if isVideo then 'video' else 'img') diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee index aa9764968..4f3812432 100755 --- a/src/Images/ImageHover.coffee +++ b/src/Images/ImageHover.coffee @@ -30,8 +30,9 @@ ImageHover = el.dataset.fullID = post.fullID $.on el, 'error', error el.src = file.URL - ImageCommon.rewind el - ImageCommon.rewind @ + if Conf['Restart when Opened'] + ImageCommon.rewind el + ImageCommon.rewind @ el.id = 'ihover' $.after Header.hover, el if isVideo