From 29dca053b695305f1f7f7100a8eefcded8485caa Mon Sep 17 00:00:00 2001 From: Harvey Zack Date: Wed, 8 May 2019 12:40:54 +0800 Subject: [PATCH] bugfix --- docs/uncompiled/artplayer-plugin-blur.js | 1 + docs/uncompiled/artplayer-plugin-blur.js.map | 2 +- packages/artplayer-plugin-blur/src/index.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/uncompiled/artplayer-plugin-blur.js b/docs/uncompiled/artplayer-plugin-blur.js index 6bdaa73c6..8e0277adc 100644 --- a/docs/uncompiled/artplayer-plugin-blur.js +++ b/docs/uncompiled/artplayer-plugin-blur.js @@ -95,6 +95,7 @@ art.on('video:ended', show); art.on('video:seeked', show); art.on('video:playing', hide); + art.on('video:seeking', hide); art.on('video:timeupdate', hide); } }; diff --git a/docs/uncompiled/artplayer-plugin-blur.js.map b/docs/uncompiled/artplayer-plugin-blur.js.map index 9c7002cb5..97a715358 100644 --- a/docs/uncompiled/artplayer-plugin-blur.js.map +++ b/docs/uncompiled/artplayer-plugin-blur.js.map @@ -1 +1 @@ -{"version":3,"file":"artplayer-plugin-blur.js","sources":["../../packages/artplayer-plugin-blur/node_modules/blur-image-url/index.js","../../packages/artplayer-plugin-blur/src/index.js"],"sourcesContent":["(function(window, factory) {\n if (typeof exports === 'object') {\n module.exports = factory();\n } else if (typeof define === 'function' && define.amd) {\n define(factory);\n } else {\n window.blurImageUrl = factory();\n }\n})(this, function() {\n return function blurImageUrl(url, radius) {\n return new Promise(function(resolve) {\n var img = new Image();\n img.onload = function() {\n var w = img.naturalWidth;\n var h = img.naturalHeight;\n var canvas = document.createElement('canvas');\n canvas.style.width = w + 'px';\n canvas.style.height = h + 'px';\n canvas.width = w;\n canvas.height = h;\n var context = canvas.getContext('2d');\n context.filter = 'blur(' + radius + 'px)';\n context.drawImage(\n img,\n -radius,\n -radius,\n w + radius * 2,\n h + radius * 2\n );\n canvas.toBlob(function(blob) {\n resolve(URL.createObjectURL(blob));\n img.onload = null;\n });\n };\n img.src = url;\n });\n };\n});\n","import blurImageUrl from 'blur-image-url';\n\nfunction artplayerPluginBlur(art) {\n const { errorHandle, clamp } = art.constructor.utils;\n const { player } = art;\n return {\n name: 'artplayerPluginBlur',\n attach($ref, radius = 15) {\n errorHandle($ref instanceof Element, 'The attach element is not a dom element');\n $ref.style.backgroundRepeat = 'no-repeat';\n $ref.style.transition = 'all .2s ease';\n\n function hide() {\n $ref.style.visibility = 'hidden';\n $ref.style.opacity = '0';\n $ref.style.pointerEvents = 'none';\n $ref.style.backgroundImage = 'none';\n }\n\n function show() {\n const { left, top } = $ref.getBoundingClientRect();\n const time = player.currentTime;\n $ref.style.backgroundImage = 'none';\n $ref.style.backgroundSize = `${player.width}px ${player.height}px`;\n $ref.style.backgroundPosition = `${player.left - left}px ${player.top - top}px`;\n player.getScreenshotBlobUrl().then(url => {\n blurImageUrl(url, clamp(radius, 0, 50)).then(img => {\n if (time === player.currentTime) {\n $ref.style.backgroundImage = `url(${img})`;\n $ref.style.visibility = 'visible';\n $ref.style.opacity = '1';\n $ref.style.pointerEvents = 'auto';\n } else {\n hide();\n }\n });\n });\n }\n\n hide();\n art.on('video:pause', show);\n art.on('video:ended', show);\n art.on('video:seeked', show);\n art.on('video:playing', hide);\n art.on('video:timeupdate', hide);\n },\n };\n}\n\nexport default artplayerPluginBlur;\n"],"names":["this","artplayerPluginBlur","art","constructor","utils","errorHandle","clamp","player","name","attach","$ref","radius","Element","style","backgroundRepeat","transition","hide","visibility","opacity","pointerEvents","backgroundImage","show","getBoundingClientRect","left","top","time","currentTime","backgroundSize","width","height","backgroundPosition","getScreenshotBlobUrl","then","url","blurImageUrl","img","on"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"artplayer-plugin-blur.js","sources":["../../packages/artplayer-plugin-blur/node_modules/blur-image-url/index.js","../../packages/artplayer-plugin-blur/src/index.js"],"sourcesContent":["(function(window, factory) {\n if (typeof exports === 'object') {\n module.exports = factory();\n } else if (typeof define === 'function' && define.amd) {\n define(factory);\n } else {\n window.blurImageUrl = factory();\n }\n})(this, function() {\n return function blurImageUrl(url, radius) {\n return new Promise(function(resolve) {\n var img = new Image();\n img.onload = function() {\n var w = img.naturalWidth;\n var h = img.naturalHeight;\n var canvas = document.createElement('canvas');\n canvas.style.width = w + 'px';\n canvas.style.height = h + 'px';\n canvas.width = w;\n canvas.height = h;\n var context = canvas.getContext('2d');\n context.filter = 'blur(' + radius + 'px)';\n context.drawImage(\n img,\n -radius,\n -radius,\n w + radius * 2,\n h + radius * 2\n );\n canvas.toBlob(function(blob) {\n resolve(URL.createObjectURL(blob));\n img.onload = null;\n });\n };\n img.src = url;\n });\n };\n});\n","import blurImageUrl from 'blur-image-url';\n\nfunction artplayerPluginBlur(art) {\n const { errorHandle, clamp } = art.constructor.utils;\n const { player } = art;\n return {\n name: 'artplayerPluginBlur',\n attach($ref, radius = 15) {\n errorHandle($ref instanceof Element, 'The attach element is not a dom element');\n $ref.style.backgroundRepeat = 'no-repeat';\n $ref.style.transition = 'all .2s ease';\n\n function hide() {\n $ref.style.visibility = 'hidden';\n $ref.style.opacity = '0';\n $ref.style.pointerEvents = 'none';\n $ref.style.backgroundImage = 'none';\n }\n\n function show() {\n const { left, top } = $ref.getBoundingClientRect();\n const time = player.currentTime;\n $ref.style.backgroundImage = 'none';\n $ref.style.backgroundSize = `${player.width}px ${player.height}px`;\n $ref.style.backgroundPosition = `${player.left - left}px ${player.top - top}px`;\n player.getScreenshotBlobUrl().then(url => {\n blurImageUrl(url, clamp(radius, 0, 50)).then(img => {\n if (time === player.currentTime) {\n $ref.style.backgroundImage = `url(${img})`;\n $ref.style.visibility = 'visible';\n $ref.style.opacity = '1';\n $ref.style.pointerEvents = 'auto';\n } else {\n hide();\n }\n });\n });\n }\n\n hide();\n art.on('video:pause', show);\n art.on('video:ended', show);\n art.on('video:seeked', show);\n art.on('video:playing', hide);\n art.on('video:seeking', hide);\n art.on('video:timeupdate', hide);\n },\n };\n}\n\nexport default artplayerPluginBlur;\n"],"names":["this","artplayerPluginBlur","art","constructor","utils","errorHandle","clamp","player","name","attach","$ref","radius","Element","style","backgroundRepeat","transition","hide","visibility","opacity","pointerEvents","backgroundImage","show","getBoundingClientRect","left","top","time","currentTime","backgroundSize","width","height","backgroundPosition","getScreenshotBlobUrl","then","url","blurImageUrl","img","on"],"mappings":";;;;;;;;;;;;;CAAA,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE;GACzB,AAAiC;KAC/B,cAAc,GAAG,OAAO,EAAE,CAAC;IAC5B,AAIA;EACF,EAAEA,cAAI,EAAE,WAAW;GAClB,OAAO,SAAS,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE;KACxC,OAAO,IAAI,OAAO,CAAC,SAAS,OAAO,EAAE;OACnC,IAAI,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;OACtB,GAAG,CAAC,MAAM,GAAG,WAAW;SACtB,IAAI,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC;SACzB,IAAI,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC;SAC1B,IAAI,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;SAC9C,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC;SAC9B,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC;SAC/B,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;SACjB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;SAClB,IAAI,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACtC,OAAO,CAAC,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;SAC1C,OAAO,CAAC,SAAS;WACf,GAAG;WACH,CAAC,MAAM;WACP,CAAC,MAAM;WACP,CAAC,GAAG,MAAM,GAAG,CAAC;WACd,CAAC,GAAG,MAAM,GAAG,CAAC;UACf,CAAC;SACF,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE;WAC3B,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;WACnC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;UACnB,CAAC,CAAC;QACJ,CAAC;OACF,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;MACf,CAAC,CAAC;IACJ,CAAC;EACH,CAAC,CAAC;;;CCnCH,SAASC,mBAAT,CAA6BC,GAA7B,EAAkC;CAAA,8BACCA,GAAG,CAACC,WAAJ,CAAgBC,KADjB;CAAA,MACtBC,WADsB,yBACtBA,WADsB;CAAA,MACTC,KADS,yBACTA,KADS;CAAA,MAEtBC,MAFsB,GAEXL,GAFW,CAEtBK,MAFsB;CAG9B,SAAO;CACHC,IAAAA,IAAI,EAAE,qBADH;CAEHC,IAAAA,MAFG,kBAEIC,IAFJ,EAEuB;CAAA,UAAbC,MAAa,uEAAJ,EAAI;CACtBN,MAAAA,WAAW,CAACK,IAAI,YAAYE,OAAjB,EAA0B,yCAA1B,CAAX;CACAF,MAAAA,IAAI,CAACG,KAAL,CAAWC,gBAAX,GAA8B,WAA9B;CACAJ,MAAAA,IAAI,CAACG,KAAL,CAAWE,UAAX,GAAwB,cAAxB;;CAEA,eAASC,IAAT,GAAgB;CACZN,QAAAA,IAAI,CAACG,KAAL,CAAWI,UAAX,GAAwB,QAAxB;CACAP,QAAAA,IAAI,CAACG,KAAL,CAAWK,OAAX,GAAqB,GAArB;CACAR,QAAAA,IAAI,CAACG,KAAL,CAAWM,aAAX,GAA2B,MAA3B;CACAT,QAAAA,IAAI,CAACG,KAAL,CAAWO,eAAX,GAA6B,MAA7B;CACH;;CAED,eAASC,IAAT,GAAgB;CAAA,oCACUX,IAAI,CAACY,qBAAL,EADV;CAAA,YACJC,IADI,yBACJA,IADI;CAAA,YACEC,GADF,yBACEA,GADF;;CAEZ,YAAMC,IAAI,GAAGlB,MAAM,CAACmB,WAApB;CACAhB,QAAAA,IAAI,CAACG,KAAL,CAAWO,eAAX,GAA6B,MAA7B;CACAV,QAAAA,IAAI,CAACG,KAAL,CAAWc,cAAX,aAA+BpB,MAAM,CAACqB,KAAtC,gBAAiDrB,MAAM,CAACsB,MAAxD;CACAnB,QAAAA,IAAI,CAACG,KAAL,CAAWiB,kBAAX,aAAmCvB,MAAM,CAACgB,IAAP,GAAcA,IAAjD,gBAA2DhB,MAAM,CAACiB,GAAP,GAAaA,GAAxE;CACAjB,QAAAA,MAAM,CAACwB,oBAAP,GAA8BC,IAA9B,CAAmC,UAAAC,GAAG,EAAI;CACtCC,UAAAA,YAAY,CAACD,GAAD,EAAM3B,KAAK,CAACK,MAAD,EAAS,CAAT,EAAY,EAAZ,CAAX,CAAZ,CAAwCqB,IAAxC,CAA6C,UAAAG,GAAG,EAAI;CAChD,gBAAIV,IAAI,KAAKlB,MAAM,CAACmB,WAApB,EAAiC;CAC7BhB,cAAAA,IAAI,CAACG,KAAL,CAAWO,eAAX,iBAAoCe,GAApC;CACAzB,cAAAA,IAAI,CAACG,KAAL,CAAWI,UAAX,GAAwB,SAAxB;CACAP,cAAAA,IAAI,CAACG,KAAL,CAAWK,OAAX,GAAqB,GAArB;CACAR,cAAAA,IAAI,CAACG,KAAL,CAAWM,aAAX,GAA2B,MAA3B;CACH,aALD,MAKO;CACHH,cAAAA,IAAI;CACP;CACJ,WATD;CAUH,SAXD;CAYH;;CAEDA,MAAAA,IAAI;CACJd,MAAAA,GAAG,CAACkC,EAAJ,CAAO,aAAP,EAAsBf,IAAtB;CACAnB,MAAAA,GAAG,CAACkC,EAAJ,CAAO,aAAP,EAAsBf,IAAtB;CACAnB,MAAAA,GAAG,CAACkC,EAAJ,CAAO,cAAP,EAAuBf,IAAvB;CACAnB,MAAAA,GAAG,CAACkC,EAAJ,CAAO,eAAP,EAAwBpB,IAAxB;CACAd,MAAAA,GAAG,CAACkC,EAAJ,CAAO,eAAP,EAAwBpB,IAAxB;CACAd,MAAAA,GAAG,CAACkC,EAAJ,CAAO,kBAAP,EAA2BpB,IAA3B;CACH;CAzCE,GAAP;CA2CH;;;;;;;;"} \ No newline at end of file diff --git a/packages/artplayer-plugin-blur/src/index.js b/packages/artplayer-plugin-blur/src/index.js index 38c228c06..a0d094b6a 100644 --- a/packages/artplayer-plugin-blur/src/index.js +++ b/packages/artplayer-plugin-blur/src/index.js @@ -42,6 +42,7 @@ function artplayerPluginBlur(art) { art.on('video:ended', show); art.on('video:seeked', show); art.on('video:playing', hide); + art.on('video:seeking', hide); art.on('video:timeupdate', hide); }, };