mirror of
https://github.com/nolanlawson/pinafore
synced 2024-12-12 02:07:26 +01:00
fix(firefox): fix firefox with blocked images (#718)
* fix(firefox): fix firefox with blocked images * remove excessive perf marks * fixup * fix lint
This commit is contained in:
parent
da7a29d503
commit
92edb3d835
@ -16,18 +16,15 @@
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
import { mark, stop } from '../_utils/marks'
|
||||
import { decodeImage } from '../_utils/decodeImage'
|
||||
|
||||
export default {
|
||||
async oncreate () {
|
||||
mark('LazyImage oncreate()')
|
||||
try {
|
||||
await decodeImage(this.refs.node)
|
||||
} catch (e) {
|
||||
this.set({ error: true })
|
||||
}
|
||||
stop('LazyImage oncreate()')
|
||||
},
|
||||
data: () => ({
|
||||
error: false,
|
||||
@ -51,4 +48,4 @@
|
||||
displaySrc: ({ error, src, fallback }) => ((error && fallback) || src)
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
@ -21,11 +21,16 @@
|
||||
import { mouseover } from '../_utils/events'
|
||||
import { decodeImage } from '../_utils/decodeImage'
|
||||
import { classname } from '../_utils/classname'
|
||||
import { ONE_TRANSPARENT_PIXEL } from '../_static/media'
|
||||
|
||||
export default {
|
||||
async oncreate () {
|
||||
let { currentSrc } = this.get()
|
||||
try {
|
||||
await decodeImage(this.refs.node)
|
||||
let image = new Image()
|
||||
image.src = currentSrc
|
||||
await decodeImage(image)
|
||||
this.set({ loaded: true })
|
||||
this.fire('imgLoad')
|
||||
} catch (e) {
|
||||
this.fire('imgLoadError', e)
|
||||
@ -42,7 +47,8 @@
|
||||
data: () => ({
|
||||
alt: '',
|
||||
title: '',
|
||||
mouseOver: false
|
||||
mouseOver: false,
|
||||
loaded: false
|
||||
}),
|
||||
computed: {
|
||||
computedClass: ({ className, src, staticSrc, isLink }) => (classname(
|
||||
@ -50,7 +56,9 @@
|
||||
src !== staticSrc && 'non-autoplay-zoom-in',
|
||||
isLink && 'is-link'
|
||||
)),
|
||||
displaySrc: ({ src, staticSrc, mouseOver }) => (mouseOver ? src : staticSrc)
|
||||
currentSrc: ({ mouseOver, src, staticSrc }) => mouseOver ? src : staticSrc,
|
||||
// using a transparent pixel as placeholder ensures broken images don't have wrong sizes
|
||||
displaySrc: ({ loaded, currentSrc }) => loaded ? currentSrc : ONE_TRANSPARENT_PIXEL
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
Loading…
Reference in New Issue
Block a user