Merge pull request #2791 from evazion/fix-safebooru-ugoiras

Fix broken ugoira player on safebooru.

app/assets/javascripts/application.js

@@ -4,6 +4,8 @@
 //= require jquery.timeout.js
 //= require jquery-ui-autocomplete-custom.js
 //= require jquery.storageapi.js
+//= require ugoira_player.js
+//= require stupidtable.js
 //= require rails.js
 //= require common.js
 //= require_tree .

app/views/posts/partials/show/_ugoira_original.html.erb

@@ -37,7 +37,6 @@
 </div>
 
 <% content_for(:html_header) do %>
-  <%= javascript_include_tag "ugoira_player" %>
   <script type="text/javascript">
     Danbooru.Ugoira = {};
 

app/views/reports/contributors.html.erb

@@ -36,7 +36,6 @@
 <% end %>
 
 <%= content_for(:html_header) do %>
-  <%= javascript_include_tag "stupidtable" %>
   <script type="text/javascript">
     $(function() {
       $("#sortable").stupidtable().on("aftertablesort", function() {
@@ -45,4 +44,4 @@
       });
     });
   </script>
-<% end %>
+<% end %>

app/views/reports/janitor_trials.html.erb

@@ -47,7 +47,6 @@
 <% end %>
 
 <%= content_for(:html_header) do %>
-  <%= javascript_include_tag "stupidtable" %>
   <script type="text/javascript">
     $(function() {
       $("#sortable").stupidtable().on("aftertablesort", function() {
@@ -56,4 +55,4 @@
       });
     });
   </script>
-<% end %>
+<% end %>

app/views/reports/user_promotions.html.erb

@@ -40,7 +40,6 @@
 <% end %>
 
 <%= content_for(:html_header) do %>
-  <%= javascript_include_tag "stupidtable" %>
   <script type="text/javascript">
     $(function() {
       $("#sortable").stupidtable().on("aftertablesort", function() {
@@ -49,4 +48,4 @@
       });
     });
   </script>
-<% end %>
+<% end %>