From ddf202397caf973b625f18dc4eba579cb8a20ccf Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 6 Apr 2014 21:54:20 -0700 Subject: [PATCH] Allow drag left even when controls are off Will be helpful if someone activates controls by right-clicking. --- builds/4chan-X.user.js | 12 ++++++------ builds/crx/script.js | 12 ++++++------ src/Images/ImageExpand.coffee | 7 +++---- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index cda45d023..802d6f0b0 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -7788,6 +7788,12 @@ file.thumb.parentNode.removeAttribute('target'); video.muted = !Conf['Allow Sound']; video.controls = Conf['Show Controls']; + video.dataset.mousedown = 'false'; + _ref = ImageExpand.videoCB; + for (eventName in _ref) { + cb = _ref[eventName]; + $.on(video, eventName, cb); + } if (Conf['Show Controls']) { contract = $.el('a', { textContent: 'contract', @@ -7798,12 +7804,6 @@ return ImageExpand.contract(post); }); file.videoControls.push($.tn('\u00A0'), contract); - video.dataset.mousedown = 'false'; - _ref = ImageExpand.videoCB; - for (eventName in _ref) { - cb = _ref[eventName]; - $.on(video, eventName, cb); - } } if (Conf['Autoplay']) { video.controls = false; diff --git a/builds/crx/script.js b/builds/crx/script.js index cedd4d9df..8e7c8a949 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -7807,6 +7807,12 @@ file.thumb.parentNode.removeAttribute('target'); video.muted = !Conf['Allow Sound']; video.controls = Conf['Show Controls']; + video.dataset.mousedown = 'false'; + _ref = ImageExpand.videoCB; + for (eventName in _ref) { + cb = _ref[eventName]; + $.on(video, eventName, cb); + } if (Conf['Show Controls']) { contract = $.el('a', { textContent: 'contract', @@ -7817,12 +7823,6 @@ return ImageExpand.contract(post); }); file.videoControls.push($.tn('\u00A0'), contract); - video.dataset.mousedown = 'false'; - _ref = ImageExpand.videoCB; - for (eventName in _ref) { - cb = _ref[eventName]; - $.on(video, eventName, cb); - } } if (Conf['Autoplay']) { video.controls = false; diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 6720bb011..da977b6de 100755 --- a/src/Images/ImageExpand.coffee +++ b/src/Images/ImageExpand.coffee @@ -157,6 +157,9 @@ ImageExpand = file.thumb.parentNode.removeAttribute 'target' video.muted = !Conf['Allow Sound'] video.controls = Conf['Show Controls'] + # drag left to contract + video.dataset.mousedown = 'false' + $.on video, eventName, cb for eventName, cb of ImageExpand.videoCB if Conf['Show Controls'] # contract link in file info contract = $.el 'a', @@ -165,10 +168,6 @@ ImageExpand = title: 'You can also contract the video by dragging it to the left.' $.on contract, 'click', (e) -> ImageExpand.contract post file.videoControls.push $.tn('\u00A0'), contract - # drag left to contract - video.dataset.mousedown = 'false' - for eventName, cb of ImageExpand.videoCB - $.on video, eventName, cb if Conf['Autoplay'] video.controls = false video.play()