jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix seek slider for thin ugoira

Browse Source
This commit is contained in:
Toks
2014-11-06 17:35:40 -05:00
parent 8096fd388c
commit ab7d06cd30
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/posts.js
View File

@@ -432,8 +432,9 @@
Danbooru.Post.resize_ugoira_controls = function() { Danbooru.Post.resize_ugoira_controls = function() {
var $img = $("#image"); var $img = $("#image");
$("#ugoira-control-panel").css("width", $img.width()); var width = Math.max($img.width(), 350);
$("#seek-slider").css("width", $img.width() - 81); $("#ugoira-control-panel").css("width", width);
$("#seek-slider").css("width", width - 81);
} }
Danbooru.Post.notice_update = function(x) { Danbooru.Post.notice_update = function(x) {

4
app/views/posts/partials/show/_ugoira.html.erb
View File

@@ -22,11 +22,11 @@
) %> ) %>
<div id="ugoira-controls"> <div id="ugoira-controls">
<div id="ugoira-control-panel" style="width: <%= @post.image_width %>px;"> <div id="ugoira-control-panel" style="width: <%= [@post.image_width, 350].max %>px;">
<%= button_tag "Play", :id => "ugoira-play", :style => "display: none;" %> <%= button_tag "Play", :id => "ugoira-play", :style => "display: none;" %>
<%= button_tag "Pause", :id => "ugoira-pause" %> <%= button_tag "Pause", :id => "ugoira-pause" %>
<p id="ugoira-load-progress">Loaded <span id="ugoira-load-percentage">0</span>%</p> <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 - 81 %>px;"></div> <div id="seek-slider" style="display: none; width: <%= [@post.image_width, 350].max - 81 %>px;"></div>
</div> </div>
<p id="save-video-link"> <p id="save-video-link">
<% if post.has_ugoira_webm? %> <% if post.has_ugoira_webm? %>