From 5fdc4a190462272f678ee313dee049493cf44f76 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 12 Apr 2021 00:02:46 +0300 Subject: [PATCH 1/4] whooops dropped my monstercondo --- src/services/ruffle_service/ruffle_service.js | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/services/ruffle_service/ruffle_service.js diff --git a/src/services/ruffle_service/ruffle_service.js b/src/services/ruffle_service/ruffle_service.js new file mode 100644 index 000000000..61fe1e195 --- /dev/null +++ b/src/services/ruffle_service/ruffle_service.js @@ -0,0 +1,37 @@ +const createRuffleService = () => { + let ruffleInstance = null + + const getRuffle = () => new Promise((resolve, reject) => { + if (ruffleInstance) resolve(ruffleInstance) + // Ruffle needs these to be set before it's loaded + // https://github.com/ruffle-rs/ruffle/issues/3952 + window.RufflePlayer = {} + window.RufflePlayer.config = { + polyfills: false, + publicPath: '/static/ruffle' + } + + // Currently it's seems like a better way of loading ruffle + // because it needs the wasm publically accessible, but it needs path to it + // and filename of wasm seems to be pseudo-randomly generated (is it a hash?) + const script = document.createElement('script') + // see webpack config, using CopyPlugin to copy it from node_modules + // provided via ruffle-mirror + script.src = '/static/ruffle/ruffle.js' + script.type = 'text/javascript' + script.onerror = (e) => { reject(e) } + script.onabort = (e) => { reject(e) } + script.oncancel = (e) => { reject(e) } + script.onload = () => { + ruffleInstance = window.RufflePlayer + resolve(ruffleInstance) + } + document.body.appendChild(script) + }) + + return { getRuffle } +} + +const RuffleService = createRuffleService() + +export default RuffleService From f0641d05dffe627abd093c296a8cf9e5296b3098 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 12 Apr 2021 00:07:28 +0300 Subject: [PATCH 2/4] linting --- src/components/attachment/attachment.vue | 5 ++++- src/components/flash/flash.js | 2 +- src/components/flash/flash.vue | 16 +++++++++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 9bb0d0bea..f80badfd0 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -118,7 +118,10 @@ - + diff --git a/src/components/flash/flash.js b/src/components/flash/flash.js index 832705a23..17a52747b 100644 --- a/src/components/flash/flash.js +++ b/src/components/flash/flash.js @@ -3,7 +3,7 @@ import { library } from '@fortawesome/fontawesome-svg-core' import { faStop } from '@fortawesome/free-solid-svg-icons' library.add( - faStop, + faStop ) const Flash = { diff --git a/src/components/flash/flash.vue b/src/components/flash/flash.vue index adef67ff7..a27d39304 100644 --- a/src/components/flash/flash.vue +++ b/src/components/flash/flash.vue @@ -8,13 +8,19 @@ /> @@ -24,8 +30,8 @@ @click="closePlayer" > - - + + From 6b250762f0fbbb7883716e072b086fb55d92218c Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 12 Apr 2021 00:52:16 +0300 Subject: [PATCH 3/4] translate a variable name to American English from Australian English --- src/components/flash/flash.js | 2 +- src/components/flash/flash.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/flash/flash.js b/src/components/flash/flash.js index 17a52747b..74ea34000 100644 --- a/src/components/flash/flash.js +++ b/src/components/flash/flash.js @@ -24,7 +24,7 @@ const Flash = { player.config = { letterbox: 'on' } - const container = this.$refs.cunt + const container = this.$refs.container container.appendChild(player) player.style.width = '100%' player.style.height = '100%' diff --git a/src/components/flash/flash.vue b/src/components/flash/flash.vue index a27d39304..fb8981e1b 100644 --- a/src/components/flash/flash.vue +++ b/src/components/flash/flash.vue @@ -2,7 +2,7 @@
From 87903fbf6dd8fbc47fe5a49b901aa295e07529e8 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 12 Apr 2021 01:15:59 +0300 Subject: [PATCH 4/4] do not load ruffle multiple times! --- src/services/ruffle_service/ruffle_service.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/services/ruffle_service/ruffle_service.js b/src/services/ruffle_service/ruffle_service.js index 61fe1e195..7411dd962 100644 --- a/src/services/ruffle_service/ruffle_service.js +++ b/src/services/ruffle_service/ruffle_service.js @@ -2,7 +2,10 @@ const createRuffleService = () => { let ruffleInstance = null const getRuffle = () => new Promise((resolve, reject) => { - if (ruffleInstance) resolve(ruffleInstance) + if (ruffleInstance) { + resolve(ruffleInstance) + return + } // Ruffle needs these to be set before it's loaded // https://github.com/ruffle-rs/ruffle/issues/3952 window.RufflePlayer = {}