From 8f6d8270fe6b1c1c88ceca46fde8b588799f5488 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 28 Sep 2015 19:42:19 -0400
Subject: [PATCH] fixes #2522

---
 app/assets/stylesheets/specific/posts.css.scss    |  6 ++++++
 .../posts/partials/show/_ugoira_original.html.erb | 15 ++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 44a6f8963..a4892dfe0 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -199,6 +199,12 @@ div#c-posts {
     div#seek-slider {
       margin-top: 0.5em;
       float: right;
+      overflow: visible;
+      background: #EEE;
+
+      .ui-progressbar-value {
+        background: white;
+      }
     }
 
     #save-video-link {
diff --git a/app/views/posts/partials/show/_ugoira_original.html.erb b/app/views/posts/partials/show/_ugoira_original.html.erb
index 9a8cdc675..80111617d 100644
--- a/app/views/posts/partials/show/_ugoira_original.html.erb
+++ b/app/views/posts/partials/show/_ugoira_original.html.erb
@@ -25,8 +25,7 @@
   <div id="ugoira-control-panel" style="width: <%= [@post.image_width, 350].max %>px;">
     <%= button_tag "Play", :id => "ugoira-play", :style => "display: none;" %>
     <%= button_tag "Pause", :id => "ugoira-pause" %>
-    <p id="ugoira-load-progress">Loaded <span id="ugoira-load-percentage">0</span>%</p>
-    <div id="seek-slider" style="display: none; width: <%= [@post.image_width, 350].max - 81 %>px;"></div>
+    <div id="seek-slider" style="width: <%= [@post.image_width, 350].max - 81 %>px;"></div>
   </div>
   <p id="save-video-link">
     <% if post.has_ugoira_webm? %>
@@ -64,13 +63,7 @@
     $(function() {
       Danbooru.Ugoira.create_player();
       $(Danbooru.Ugoira.player).on("loadProgress", function(ev, progress) {
-        $("#ugoira-load-percentage").text(Math.floor(progress * 100));
-      });
-      $(Danbooru.Ugoira.player).on("loadingStateChanged", function(ev, state) {
-        if (state === 2) {
-          $("#ugoira-load-progress").remove();
-          $("#seek-slider").show();
-        }
+        $("#seek-slider").progressbar("value", Math.floor(progress * 100));
       });
 
       var player_manually_paused = false;
@@ -89,6 +82,10 @@
         e.preventDefault();
       });
 
+      $("#seek-slider").progressbar({
+        value: 0
+      });
+
       $("#seek-slider").slider({
         min: 0,
         max: Danbooru.Ugoira.player._frameCount-1,