video hover
This commit is contained in:
parent
3e6dfea6ae
commit
26576b4420
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -145,7 +145,7 @@ Config =
|
|||||||
]
|
]
|
||||||
'Image Hover': [
|
'Image Hover': [
|
||||||
true
|
true
|
||||||
'Show full image on mouseover.'
|
'Show full image / video on mouseover.'
|
||||||
]
|
]
|
||||||
'Gallery': [
|
'Gallery': [
|
||||||
true
|
true
|
||||||
|
|||||||
@ -362,7 +362,7 @@ UI = do ->
|
|||||||
|
|
||||||
hoverend = (e) ->
|
hoverend = (e) ->
|
||||||
return if e.type is 'keydown' and e.keyCode isnt 13 or e.target.nodeName is "TEXTAREA"
|
return if e.type is 'keydown' and e.keyCode isnt 13 or e.target.nodeName is "TEXTAREA"
|
||||||
$.rm @el
|
$.rm @el if @el.parentNode is Header.hover
|
||||||
$.off @root, @endEvents, @hoverend
|
$.off @root, @endEvents, @hoverend
|
||||||
$.off d, 'keydown', @hoverend
|
$.off d, 'keydown', @hoverend
|
||||||
$.off @root, 'mousemove', @hover
|
$.off @root, 'mousemove', @hover
|
||||||
|
|||||||
@ -108,7 +108,7 @@ div.center:not(.ad-cnt) {
|
|||||||
/* fixed, z-index */
|
/* fixed, z-index */
|
||||||
#overlay,
|
#overlay,
|
||||||
#fourchanx-settings,
|
#fourchanx-settings,
|
||||||
#qp, #ihover,
|
#qp, .ihover,
|
||||||
#navlinks, .fixed #header-bar,
|
#navlinks, .fixed #header-bar,
|
||||||
:root.float #updater,
|
:root.float #updater,
|
||||||
:root.float #thread-stats,
|
:root.float #thread-stats,
|
||||||
@ -124,7 +124,7 @@ div.center:not(.ad-cnt) {
|
|||||||
#notifications {
|
#notifications {
|
||||||
z-index: 70;
|
z-index: 70;
|
||||||
}
|
}
|
||||||
#qp, #ihover {
|
#qp, .ihover {
|
||||||
z-index: 60;
|
z-index: 60;
|
||||||
}
|
}
|
||||||
#menu {
|
#menu {
|
||||||
@ -729,7 +729,7 @@ span.hide-announcement {
|
|||||||
:root.gecko.fit-width .full-image {
|
:root.gecko.fit-width .full-image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
#ihover {
|
.ihover {
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
|
|||||||
@ -103,9 +103,12 @@ ImageExpand =
|
|||||||
return if post.isHidden or post.file.isExpanded or $.hasClass thumb, 'expanding'
|
return if post.isHidden or post.file.isExpanded or $.hasClass thumb, 'expanding'
|
||||||
$.addClass thumb, 'expanding'
|
$.addClass thumb, 'expanding'
|
||||||
naturalHeight = if isVideo then 'videoHeight' else 'naturalHeight'
|
naturalHeight = if isVideo then 'videoHeight' else 'naturalHeight'
|
||||||
if post.file.fullImage
|
if img = post.file.fullImage
|
||||||
# Expand already-loaded/ing picture.
|
# Expand already-loaded/ing picture.
|
||||||
$.asap (-> post.file.fullImage[naturalHeight]), ->
|
$.rmClass img, 'ihover'
|
||||||
|
$.addClass img, 'full-image'
|
||||||
|
img.controls = (img.parentNode isnt thumb.parentNode)
|
||||||
|
$.asap (-> img[naturalHeight]), ->
|
||||||
ImageExpand.completeExpand post
|
ImageExpand.completeExpand post
|
||||||
return
|
return
|
||||||
post.file.fullImage = img = $.el (if isVideo then 'video' else 'img'),
|
post.file.fullImage = img = $.el (if isVideo then 'video' else 'img'),
|
||||||
|
|||||||
@ -6,21 +6,39 @@ ImageHover =
|
|||||||
name: 'Image Hover'
|
name: 'Image Hover'
|
||||||
cb: @node
|
cb: @node
|
||||||
node: ->
|
node: ->
|
||||||
return unless @file?.isImage
|
return unless @file?.isImage or @file?.isVideo
|
||||||
$.on @file.thumb, 'mouseover', ImageHover.mouseover
|
$.on @file.thumb, 'mouseover', ImageHover.mouseover
|
||||||
mouseover: (e) ->
|
mouseover: (e) ->
|
||||||
post = Get.postFromNode @
|
post = Get.postFromNode @
|
||||||
el = $.el 'img',
|
{isVideo} = post.file
|
||||||
id: 'ihover'
|
if post.file.fullImage
|
||||||
src: post.file.URL
|
el = post.file.fullImage
|
||||||
|
$.rmClass el, 'full-image'
|
||||||
|
$.addClass el, 'ihover'
|
||||||
|
else
|
||||||
|
el = $.el (if isVideo then 'video' else 'img'),
|
||||||
|
className: 'ihover'
|
||||||
|
src: post.file.URL
|
||||||
|
post.file.fullImage = el
|
||||||
|
{thumb} = post.file
|
||||||
|
$.after (if isVideo and Conf['Show Controls'] then thumb.parentNode else thumb), el
|
||||||
el.dataset.fullID = post.fullID
|
el.dataset.fullID = post.fullID
|
||||||
$.add Header.hover, el
|
if isVideo
|
||||||
|
el.loop = true
|
||||||
|
el.controls = false
|
||||||
|
el.muted = true
|
||||||
|
el.play() if Conf['Autoplay']
|
||||||
|
naturalHeight = if post.file.isVideo then 'videoHeight' else 'naturalHeight'
|
||||||
UI.hover
|
UI.hover
|
||||||
root: @
|
root: @
|
||||||
el: el
|
el: el
|
||||||
latestEvent: e
|
latestEvent: e
|
||||||
endEvents: 'mouseout click'
|
endEvents: 'mouseout click'
|
||||||
asapTest: -> el.naturalHeight
|
asapTest: -> el[naturalHeight]
|
||||||
|
cb: ->
|
||||||
|
el.pause() if isVideo
|
||||||
|
$.rmClass el, 'ihover'
|
||||||
|
$.addClass el, 'full-image'
|
||||||
$.on el, 'error', ImageHover.error
|
$.on el, 'error', ImageHover.error
|
||||||
error: ->
|
error: ->
|
||||||
return unless doc.contains @
|
return unless doc.contains @
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user