From aeec46b212eeb5c730421cd393cc6c69f287422f Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 26 Jan 2020 18:56:44 -0600
Subject: [PATCH] views: move inline javascript to app bundle.

---
 app/javascript/src/javascripts/forum_posts.js  |  6 ++++++
 app/javascript/src/javascripts/posts.js.erb    | 12 ++++++++++++
 app/javascript/src/javascripts/uploads.js.erb  |  6 ++++++
 app/javascript/src/javascripts/users.js        | 18 ++++++++++++++++++
 app/views/forum_topics/show.html.erb           | 12 ------------
 .../partials/show/_ugoira_original.html.erb    | 12 ------------
 app/views/uploads/batch.html.erb               | 12 ------------
 app/views/users/edit.html.erb                  | 16 ----------------
 8 files changed, 42 insertions(+), 52 deletions(-)
 create mode 100644 app/javascript/src/javascripts/users.js

diff --git a/app/javascript/src/javascripts/forum_posts.js b/app/javascript/src/javascripts/forum_posts.js
index ab49758d7..9b8f7ef0c 100644
--- a/app/javascript/src/javascripts/forum_posts.js
+++ b/app/javascript/src/javascripts/forum_posts.js
@@ -20,6 +20,12 @@ ForumPost.initialize_edit_links = function() {
     $("#edit_forum_topic_" + forum_topic_id).fadeToggle("fast");
     e.preventDefault();
   });
+
+  $(document).on("click.danbooru", "#c-forum-topics #a-show #new-response-link", function (e) {
+    $("#topic-response").show();
+    document.body.scrollIntoView(false);
+    e.preventDefault();
+  });
 }
 
 $(document).ready(function() {
diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb
index 58ce1fb80..d678c5706 100644
--- a/app/javascript/src/javascripts/posts.js.erb
+++ b/app/javascript/src/javascripts/posts.js.erb
@@ -3,6 +3,7 @@ import Utility from './utility'
 import Hammer from 'hammerjs'
 import Cookie from './cookie'
 import Note from './notes'
+import Ugoira from './ugoira'
 import Rails from '@rails/ujs'
 
 let Post = {};
@@ -34,6 +35,7 @@ Post.initialize_all = function() {
     this.initialize_post_image_resize_links();
     this.initialize_post_image_resize_to_window_link();
     this.initialize_recommended();
+    this.initialize_ugoira_player();
 
     if (CurrentUser.data("always-resize-images") || (Utility.meta("viewport") && (window.screen.width <= 660))) {
       $("#image-resize-to-window-link").click();
@@ -451,6 +453,16 @@ Post.initialize_post_sections = function() {
   });
 }
 
+Post.initialize_ugoira_player = function() {
+  if ($("#ugoira-controls").length) {
+    let content_type = $("#image").data("ugoira-content-type");
+    let frames = $("#image").data("ugoira-frames");
+    let file_url = $("#image-container").data("file-url");
+
+    Ugoira.create_player(content_type, frames, file_url);
+  }
+};
+
 Post.resize_ugoira_controls = function() {
   var $img = $("#image");
   var width = Math.max($img.width(), 350);
diff --git a/app/javascript/src/javascripts/uploads.js.erb b/app/javascript/src/javascripts/uploads.js.erb
index d445136c2..7520e6b2e 100644
--- a/app/javascript/src/javascripts/uploads.js.erb
+++ b/app/javascript/src/javascripts/uploads.js.erb
@@ -42,6 +42,8 @@ Upload.initialize_all = function() {
       Upload.toggle_translation();
       e.preventDefault();
     });
+
+    $(document).on("click.danbooru", "#c-uploads #a-batch #link", Upload.batch_open_all);
   }
 
   if ($("#c-uploads #a-new").length) {
@@ -209,6 +211,10 @@ Upload.initialize_dropzone = function() {
   });
 };
 
+Upload.batch_open_all = function() {
+  $(".upload-preview > a").each((_i, link) => window.open(link.href));
+};
+
 $(function() {
   Upload.initialize_all();
 });
diff --git a/app/javascript/src/javascripts/users.js b/app/javascript/src/javascripts/users.js
new file mode 100644
index 000000000..aab67fd21
--- /dev/null
+++ b/app/javascript/src/javascripts/users.js
@@ -0,0 +1,18 @@
+let User = {};
+
+User.initialize_all = function() {
+  $(document).on("click.danbooru", "#c-users #a-edit #edit-options a", User.toggle_edit_tab);
+}
+
+User.toggle_edit_tab = function(e) {
+  let $target = $(e.target);
+  $("h2 a").removeClass("active");
+  $("#basic-settings-section,#advanced-settings-section").hide();
+  $target.addClass("active")
+  $($target.attr("href") + "-section").show();
+  e.preventDefault();
+};
+
+$(User.initialize_all);
+
+export default User
diff --git a/app/views/forum_topics/show.html.erb b/app/views/forum_topics/show.html.erb
index 03b0bc11d..e8bd99d32 100644
--- a/app/views/forum_topics/show.html.erb
+++ b/app/views/forum_topics/show.html.erb
@@ -41,15 +41,3 @@
     <%= numbered_paginator(@forum_posts) %>
   </div>
 </div>
-
-<% content_for(:html_header) do %>
-  <script>
-    $(function() {
-      $("#new-response-link").click(function(e) {
-        $("#topic-response").show();
-        document.body.scrollIntoView(false);
-        e.preventDefault();
-      })
-    });
-  </script>
-<% end %>
diff --git a/app/views/posts/partials/show/_ugoira_original.html.erb b/app/views/posts/partials/show/_ugoira_original.html.erb
index 24ab12600..5004d8ea1 100644
--- a/app/views/posts/partials/show/_ugoira_original.html.erb
+++ b/app/views/posts/partials/show/_ugoira_original.html.erb
@@ -35,15 +35,3 @@
     <% end %>
   </p>
 </div>
-
-<% content_for(:html_header) do %>
-  <script type="text/javascript">
-    $(function() {
-      Danbooru.Ugoira.create_player(
-        <%= raw @post.pixiv_ugoira_frame_data.content_type.to_json %>, 
-        <%= raw @post.pixiv_ugoira_frame_data.data.to_json %>,
-        "<%= @post.file_url %>"
-      );      
-    });
-  </script>
-<% end %>
diff --git a/app/views/uploads/batch.html.erb b/app/views/uploads/batch.html.erb
index f10330a4b..79bdaa9cf 100644
--- a/app/views/uploads/batch.html.erb
+++ b/app/views/uploads/batch.html.erb
@@ -35,15 +35,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:html_header) do %>
-  <script type="text/javascript">
-    $(function() {
-      $("#link").click(function() {
-        $(".upload-preview > a").each(function(i, v) {
-          window.open(v.href);
-        });
-      });
-    })
-  </script>
-<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 0e8402bad..4ed6773a0 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -75,19 +75,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:html_header) do %>
-  <script type="text/javascript">
-    $(function() {
-      $("#advanced-settings-section").hide();
-      $("#edit-options a").on("click", function(e) {
-        var $target = $(e.target);
-        $("h2 a").removeClass("active");
-        $("#basic-settings-section,#advanced-settings-section").hide();
-        $target.addClass("active")
-        $($target.attr("href") + "-section").show();
-        e.preventDefault();
-      });
-    });
-  </script>
-<% end %>