Merge pull request #175 from nnnnn319/dev

edit_yap article_yap commit bug

cmd/gopcomm/yap/article_yap.html

@@ -37,7 +37,7 @@
  <link href="https://fonts.proxy.ustclug.org/css2?family=Noto+Sans+SC&display=swap" rel="stylesheet">
 
  <!-- markdown -->
- <link rel="stylesheet" href="/static/GoplusMarkdown/style7.css">
+ <link rel="stylesheet" href="/static/GoplusMarkdown/style.css">
  <link rel="stylesheet" href="https://cdn.plyr.io/3.6.8/plyr.css" >
  <script data-widgets="code" src="https://goplus.org/widgets/loader.js"></script>
 
@@ -51,7 +51,7 @@
 <script src="https://cdn.plyr.io/3.6.8/plyr.js"></script>
 <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
 <script data-widgets="code" src="https://goplus.org/widgets/loader.js"></script>
-<script src="/static/GoplusMarkdown/GoplusMarkdown11.umd.cjs"></script>
+<script src="/static/GoplusMarkdown/GoplusMarkdown.umd.cjs"></script>
 
 
 

cmd/gopcomm/yap/edit_yap.html

@@ -36,7 +36,7 @@
  <!-- markdown -->
 
  <link rel="stylesheet" href="/static/GoplusMarkdown/style.css">
- <link rel="stylesheet" href="https://cdn.plyr.io/3.6.8/plyr.css">
+ <link rel="stylesheet" href="https://cdn.plyr.io/3.7.8/plyr.css">
 
  <!-- Resource Import -->
  <!-- <script type="module" crossorigin src="/static/assets/index-s63-Szuh.js"></script>
@@ -46,7 +46,7 @@
 <!-- <script src="https://cdn.plyr.io/3.6.8/plyr.js"></script> -->
 <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
 <script data-widgets="code" src="https://goplus.org/widgets/loader.js"></script>
-<script src="/static/GoplusMarkdown/GoplusMarkdown11.umd.cjs"></script>
+<script src="/static/GoplusMarkdown/GoplusMarkdown.umd.cjs"></script>
 <script src="https://cdn.plyr.io/3.7.8/plyr.js"></script>
 
 <script type="importmap">
@@ -256,7 +256,7 @@
  <!-- Content -->
  <markdown-editor></markdown-editor>
 
- <video controls crossorigin playsinline poster="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg">
+ <!-- <video controls crossorigin playsinline poster="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg">
  <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4" type="video/mp4" size="576">
  <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-720p.mp4" type="video/mp4" size="720">
  <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-1080p.mp4" type="video/mp4" size="1080">
@@ -265,7 +265,7 @@
  default>
  <track kind="captions" label="Français" srclang="fr" src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.fr.vtt">
  <a href="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4" download>Download</a>
- </video>
+ </video> -->
  </div>
 
  <script>

cmd/gopcomm/yap/markdown-vue/src/App.vue

@@ -8,7 +8,8 @@ import MarkdownViewer from './components/MarkdownViewer.vue';
 
 <template>
  <markdown-editor></markdown-editor>
- <markdown-viewer md="```gop println ```"></markdown-viewer>
+ <markdown-viewer :md="c"></markdown-viewer>
+ <!-- <markdown-viewer md="!video[video/mp4](https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4)(https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt)"></markdown-viewer> -->
  <!-- <video id="player" playsinline controls data-poster="/path/to/poster.jpg" ref="plyr">
  <source src="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4" type="video/mp4" />
  </video> -->
@@ -51,9 +52,14 @@ export default {
  // crossorigin: 'anonymous',
  // poster: '',
  // playsinline: true
+ c: "!video[video/mp4](https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-576p.mp4)(https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.en.vtt)"
  }
  },
  mounted() {
+ setTimeout(() => {
+ this.c = "```gop ```"
+ console.log("set time out")
+ }, 5000)
  // const player = new Plyr(this.$refs.plyr, {
  // controls: ['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'airplay', 'fullscreen']
  // })

cmd/gopcomm/yap/markdown-vue/src/components/MarkdownViewer.vue

@@ -97,7 +97,9 @@ export default {
  let vtt_a = now_v[i]
  console.log("=========duibi", src, src_a)
  // console.log("src", src)
- return `<div><video controls crossorigin playsinline data-poster="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg" id="player"><source src=${src_a} type="video/mp4" size="576"/><track kind="captions" label="English" srclang="en" src=${vtt_a} default/><track kind="captions" label="Français" srclang="fr" src=${vtt_a}/><a href=${src_a} download>Download</a></video></div>`
+ // return `<div><video controls crossorigin playsinline data-poster="https://cdn.plyr.io/static/demo/View_From_A_Blue_Moon_Trailer-HD.jpg" id="player"><source src=${src_a} type="video/mp4" size="576"/><track kind="captions" label="English" srclang="en" src=${vtt_a} default/><track kind="captions" label="Français" srclang="fr" src=${vtt_a}/><a href=${src_a} download>Download</a></video></div>`
+ let poster = src_a + "/vframe/jpg/offset/7"
+ return `<div><video controls crossorigin playsinline preload="meta" poster=${poster} id="player"><source src=${src_a} type="video/mp4" size="576"/><track kind="captions" label="English" srclang="en" src=${vtt_a} default/><track kind="captions" label="Français" srclang="fr" src=${vtt_a}/><a href=${src_a} download>Download</a></video></div>`
  })
  }
  console.log("replace")