From 024f0c1290ae846eacd80d2f4fc57bb82666274f Mon Sep 17 00:00:00 2001
From: Alek Ratzloff <alekratz@gmail.com>
Date: Thu, 23 Jun 2022 22:58:31 -0700
Subject: [PATCH] Move openBanWindow to its own separate file

It is now shared between the admin view and the inline view.

Signed-off-by: Alek Ratzloff <alekratz@gmail.com>
---
 board/static/board/ban_menu.js                | 19 +------------------
 board/static/board/ban_window.js              | 18 ++++++++++++++++++
 board/static/board/post.js                    |  2 +-
 .../admin/board/reportrecord/change_list.html |  7 +++++--
 board/templates/board/base.html               |  1 +
 5 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 board/static/board/ban_window.js

diff --git a/board/static/board/ban_menu.js b/board/static/board/ban_menu.js
index 9a00ef0..fb0f9df 100644
--- a/board/static/board/ban_menu.js
+++ b/board/static/board/ban_menu.js
@@ -1,25 +1,8 @@
-function openBanWindow(e, postElement) {
-    e.preventDefault();
-    let banUrl = $(postElement).attr("data-ban-url");
-    if (window.top.banWindow) {
-        window.top.banWindow.close();
-    }
-    window.top.banWindow = new WinBox("New ban", {
-        url: banUrl,
-        x: "center",
-        y: "center",
-        root: document.body,
-        onclose: function (force) {
-            window.top.banWindow = null;
-        }
-    });
-}
-
 if (typeof window.menuItemFactories !== "undefined") {
     window.menuItemFactories.push(
         (postElement) => $("<a>")
             .text("Ban")
             .attr("href", "#")
-            .on("click", (e) => { return openBanWindow(e, postElement); })
+            .on("click", (e) => { openBanWindow(e, $(postElement).attr("data-ban-url")); })
     )
 }
\ No newline at end of file
diff --git a/board/static/board/ban_window.js b/board/static/board/ban_window.js
new file mode 100644
index 0000000..7e3aa5e
--- /dev/null
+++ b/board/static/board/ban_window.js
@@ -0,0 +1,18 @@
+function openBanWindow(e, banUrl) {
+    e.preventDefault();
+    if (window.top.banWindow) {
+        window.top.banWindow.close();
+    }
+    window.top.banWindow = new WinBox("New ban", {
+        class: ["nobuttons"],
+        url: banUrl,
+        x: "center",
+        y: "center",
+        width: 475,
+        height: 475,
+        root: document.body,
+        onclose: function (force) {
+            window.top.banWindow = null;
+        }
+    });
+}
\ No newline at end of file
diff --git a/board/static/board/post.js b/board/static/board/post.js
index 8854f56..980886b 100644
--- a/board/static/board/post.js
+++ b/board/static/board/post.js
@@ -87,5 +87,5 @@ window.menuItemFactories.push(
         $("<a>")
             .text("Report")
             .attr("href", "#")
-            .on("click", (e) => { return openReportWindow(e, postElement); })
+            .on("click", (e) => { openReportWindow(e, postElement); })
 );
\ No newline at end of file
diff --git a/board/templates/admin/board/reportrecord/change_list.html b/board/templates/admin/board/reportrecord/change_list.html
index 1eec199..00e1fa8 100644
--- a/board/templates/admin/board/reportrecord/change_list.html
+++ b/board/templates/admin/board/reportrecord/change_list.html
@@ -32,13 +32,15 @@
 {{block.super}}
 <script src="{% static 'board/jquery.js' %}"></script>
 <script src="{% static 'board/winbox.bundle.js' %}"></script>
+<script src="{% static 'board/ban_window.js' %}"></script>
 {% endblock extrahead %}
 
 {% block footer %}
 {{block.super}}
 <script>
 
-function openBanWindow(e) {
+/*
+function openBanWindow(e, banUrl) {
     e.preventDefault();
     let banUrl = e.target.getAttribute("data-ban-url");
     if (window.banWindow) {
@@ -55,12 +57,13 @@ function openBanWindow(e) {
         }
     });
 }
+*/
 
 function onLoad(e) {
     window.banWindow = null;
 }
 
-$(".ban_link").on("click", openBanWindow);
+$(".ban_link").on("click", (e) => { openBanWindow(e, $(e.target).attr("data-ban-url")); });
 $(window).on("load", onLoad);
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/board/templates/board/base.html b/board/templates/board/base.html
index 090a584..b94fda0 100644
--- a/board/templates/board/base.html
+++ b/board/templates/board/base.html
@@ -12,6 +12,7 @@
         <script src="{% static 'board/winbox.bundle.js' %}"></script>
         <script src="{% static 'board/post.js' %}"></script>
         {% if perms.board.create_ban %}
+            <script src="{% static 'board/ban_window.js' %}"></script>
             <script src="{% static 'board/ban_menu.js' %}"></script>
         {% endif %}
         {% block extrajs %}{% endblock %}