From fb612391474d769f1e7bacfad8ee416f1b16fc29 Mon Sep 17 00:00:00 2001 From: Alek Ratzloff Date: Sat, 25 Jun 2022 21:05:31 -0700 Subject: [PATCH] Add JSFrame implementation for report window Signed-off-by: Alek Ratzloff --- board/static/board/post.js | 10 +++++----- board/templates/board/post_detail.html | 1 - board/templates/board/report_success.html | 4 +++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/board/static/board/post.js b/board/static/board/post.js index 3f43c5d..f0d851d 100644 --- a/board/static/board/post.js +++ b/board/static/board/post.js @@ -71,16 +71,16 @@ function openReportWindow(e, postElement) { e.preventDefault(); // If there's already a report window open, close it and open this one. if (window.top.reportWindow) { - window.top.reportWindow.close(); + window.top.reportWindow.closeFrame(); } let reportUrl = $(postElement).attr("data-report-url"); - window.reportWindow = new WinBox("New Report", { + window.top.reportWindow = jsFrame.create({ url: reportUrl, modal: true, - onclose: function (force) { - window.top.reportWindow = null; - } + width: 360, + height: 95, }); + window.top.reportWindow.show(); } function onLoad(e) { diff --git a/board/templates/board/post_detail.html b/board/templates/board/post_detail.html index 974ca79..dd9135f 100644 --- a/board/templates/board/post_detail.html +++ b/board/templates/board/post_detail.html @@ -78,7 +78,6 @@ function openReplyWindow() { url: REPLY_URL, }); window.top.replyWindow.show(); - window.top.replyWindow.on("hid", (frame, info) => console.log("hidden")); } function replyTextbox() { diff --git a/board/templates/board/report_success.html b/board/templates/board/report_success.html index 8efe714..97fc79a 100644 --- a/board/templates/board/report_success.html +++ b/board/templates/board/report_success.html @@ -20,7 +20,9 @@ function isIframe() { setTimeout(function() { if(isIframe()) { - window.top.reportWindow.close(); + if(typeof window.top.reportWindow !== "undefined" && window.top.reportWindow) { + window.top.reportWindow.closeFrame(); + } } else { window.close(); }