SWREI/switched
0
0
Fork 0
Code

Merge pull request #2405 from acid-chicken/patch-4

Browse Source 
Migrate summaly to 2.1.4
This commit is contained in:
syuilo 2018-08-23 00:45:25 +09:00 committed by GitHub
commit 2713064f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/client/app/common/views/components/url-preview.vue
View File

@ -1,5 +1,7 @@
<template> <template>
<iframe v-if="player" :src="player" heigth="250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen /> <div v-if="player.url" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
<iframe :src="player.url" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
</div>
<div v-else-if="tweetUrl && detail" class="twitter"> <div v-else-if="tweetUrl && detail" class="twitter">
<blockquote ref="tweet" class="twitter-tweet" :data-theme="$store.state.device.darkmode ? 'dark' : null"> <blockquote ref="tweet" class="twitter-tweet" :data-theme="$store.state.device.darkmode ? 'dark' : null">
<a :href="url"></a> <a :href="url"></a>
@ -46,7 +48,11 @@ export default Vue.extend({
thumbnail: null, thumbnail: null,
icon: null, icon: null,
sitename: null, sitename: null,
player: null, player: {
url: null,
width: null,
height: null
},
tweetUrl: null, tweetUrl: null,
misskeyUrl misskeyUrl
}; };
@ -170,9 +176,17 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
iframe .twitter
position relative
width 100% width 100%
> iframe
height 100%
left 0
position absolute
top 0
width 100%
root(isDark) root(isDark)
> a > a
display block display block