Merge branch 'flash-support' into shigusegubu

* flash-support:
  do not load ruffle multiple times!
  translate a variable name to American English from Australian English
  linting
  whooops dropped my monstercondo
This commit is contained in:
Henry Jameson 2021-04-12 01:16:44 +03:00
commit 21719c4f2d
4 changed files with 22 additions and 10 deletions

View file

@ -118,7 +118,10 @@
</div> </div>
</div> </div>
<Flash v-if="type === 'flash'" :src="attachment.large_thumb_url || attachment.url" /> <Flash
v-if="type === 'flash'"
:src="attachment.large_thumb_url || attachment.url"
/>
</div> </div>
</template> </template>

View file

@ -3,7 +3,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
import { faStop } from '@fortawesome/free-solid-svg-icons' import { faStop } from '@fortawesome/free-solid-svg-icons'
library.add( library.add(
faStop, faStop
) )
const Flash = { const Flash = {
@ -24,7 +24,7 @@ const Flash = {
player.config = { player.config = {
letterbox: 'on' letterbox: 'on'
} }
const container = this.$refs.cunt const container = this.$refs.container
container.appendChild(player) container.appendChild(player)
player.style.width = '100%' player.style.width = '100%'
player.style.height = '100%' player.style.height = '100%'

View file

@ -2,19 +2,25 @@
<div class="Flash"> <div class="Flash">
<div <div
v-if="player" v-if="player"
ref="cunt" ref="container"
class="player" class="player"
:class="{ hidden: player === 'hidden' }" :class="{ hidden: player === 'hidden' }"
/> />
<button <button
v-if="player === false || player === 'hidden'" v-if="player === false || player === 'hidden'"
@click="openPlayer"
class="button-unstyled placeholder" class="button-unstyled placeholder"
@click="openPlayer"
> >
<span v-if="player === 'hidden'" class="label"> <span
v-if="player === 'hidden'"
class="label"
>
{{ $t('general.loading') }} {{ $t('general.loading') }}
</span> </span>
<span v-else class="label"> <span
v-else
class="label"
>
{{ $t('general.flash_content') }} {{ $t('general.flash_content') }}
</span> </span>
</button> </button>
@ -24,8 +30,8 @@
@click="closePlayer" @click="closePlayer"
> >
<FAIcon icon="stop" /> <FAIcon icon="stop" />
</button> </button>
</div> </div>
</template> </template>
<script src="./flash.js"></script> <script src="./flash.js"></script>

View file

@ -2,7 +2,10 @@ const createRuffleService = () => {
let ruffleInstance = null let ruffleInstance = null
const getRuffle = () => new Promise((resolve, reject) => { 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 // Ruffle needs these to be set before it's loaded
// https://github.com/ruffle-rs/ruffle/issues/3952 // https://github.com/ruffle-rs/ruffle/issues/3952
window.RufflePlayer = {} window.RufflePlayer = {}