]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix player progress bar when changing resolution
authorChocobozzz <me@florianbigard.com>
Fri, 16 Nov 2018 08:16:41 +0000 (09:16 +0100)
committerChocobozzz <me@florianbigard.com>
Fri, 16 Nov 2018 08:16:41 +0000 (09:16 +0100)
client/src/assets/player/images/tick-white.svg [moved from client/src/assets/player/images/tick.svg with 100% similarity]
client/src/assets/player/peertube-videojs-plugin.ts
client/src/sass/player/settings-menu.scss

index 40da5f1f7c3c1c4fa1785b977a6d9ab3a3e03076..4fd5a9be22d5fa04a4e98e814849cb7e0468029c 100644 (file)
@@ -111,6 +111,8 @@ class PeerTubePlugin extends Plugin {
       const muted = getStoredMute()
       if (muted !== undefined) this.player.muted(muted)
 
+      this.player.duration(options.videoDuration)
+
       this.initializePlayer()
       this.runTorrentInfoScheduler()
       this.runViewAdd()
@@ -302,6 +304,9 @@ class PeerTubePlugin extends Plugin {
 
         this.flushVideoFile(previousVideoFile)
 
+        // Update progress bar (just for the UI), do not wait rendering
+        if (options.seek) this.player.currentTime(options.seek)
+
         const renderVideoOptions = { autoplay: false, controls: true }
         renderVideo(torrent.files[ 0 ], this.playerElement, renderVideoOptions, (err, renderer) => {
           this.renderer = renderer
index d065e72fb1178f0225e770cda6b517bbbec98b88..61965c85ee71c0e98f750cf09549ea6493499bf8 100644 (file)
@@ -171,7 +171,7 @@ $setting-transition-easing: ease-out;
               left: 8px;
               content: ' ';
               margin-top: 1px;
-              background-image: url('#{$assets-path}/player/images/tick.svg');
+              background-image: url('#{$assets-path}/player/images/tick-white.svg');
             }
           }
         }
@@ -197,4 +197,4 @@ $setting-transition-easing: ease-out;
       }
     }
   }
-}
\ No newline at end of file
+}