diff --git a/board/static/board/ban_menu.js b/board/static/board/ban_menu.js index fb0f9df..cb20168 100644 --- a/board/static/board/ban_menu.js +++ b/board/static/board/ban_menu.js @@ -3,6 +3,9 @@ if (typeof window.menuItemFactories !== "undefined") { (postElement) => $("") .text("Ban") .attr("href", "#") - .on("click", (e) => { openBanWindow(e, $(postElement).attr("data-ban-url")); }) + .on("click", (e) => { + e.preventDefault(); + openBanWindow($(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 index 7e3aa5e..80da26c 100644 --- a/board/static/board/ban_window.js +++ b/board/static/board/ban_window.js @@ -1,18 +1,23 @@ -function openBanWindow(e, banUrl) { - e.preventDefault(); - if (window.top.banWindow) { - window.top.banWindow.close(); +// HACK: this should be a const, but it will cause an error if included twice in +// the same page (like an iframe). +if (typeof window.banWindowName === "undefined") { + window.banWindowName = "ban-window"; +} + +function getBanWindow() { + return window.top.jsFrame.getWindowByName(banWindowName); +} + +function openBanWindow(banUrl) { + if (window.top.jsFrame.containsWindowName(banWindowName)) { + getBanWindow().closeFrame(); } - window.top.banWindow = new WinBox("New ban", { - class: ["nobuttons"], - url: banUrl, - x: "center", - y: "center", + let banWindow = window.top.jsFrame.create({ + title: "New Ban", + name: banWindowName, width: 475, height: 475, - root: document.body, - onclose: function (force) { - window.top.banWindow = null; - } + url: banUrl, }); + banWindow.show(); } \ No newline at end of file diff --git a/board/static/board/post.js b/board/static/board/post.js index f0d851d..220288d 100644 --- a/board/static/board/post.js +++ b/board/static/board/post.js @@ -1,5 +1,6 @@ const OPEN = "open"; const CLOSED = "closed"; +const replyWindowName = "reply-window"; function documentClick(e) { let sender = e.target; @@ -16,24 +17,7 @@ function documentClick(e) { } function doQuote(e) { - $(window).trigger("quote", [$(e.target).text()]); - /* - return; - let idText = $("#id_text"); - // Try to set ID text - if (!idText.length) { - idText = $("iframe").contents().find("#id_text"); - } - // If we couldn't find an ID text, open the appropriate window - if (!idText.length) { - window.dispatchEvent(event); - } - // TODO - let caret = idText[0].selectionStart; - let text = idText.val(); - let toAdd = ">>" + e.target.innerText + "\n"; - idText.val(text.substring(0, caret) + toAdd + text.substring(caret)); - */ + $(window.top).trigger("quote", [$(e.target).text()]); } function closeMenu(e) { @@ -67,31 +51,56 @@ function openMenu(e) { $(document).on("click", closeMenu); } -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.closeFrame(); +//////////////////////////////////////////////////////////////////////////////// +// Reply window +//////////////////////////////////////////////////////////////////////////////// + +function openReplyWindow(replyUrl) { + if (window.top.jsFrame.containsWindowName(replyWindowName)) { + // if there's already a new reply window, don't override it and just let + // it continue to exist. + return; } - let reportUrl = $(postElement).attr("data-report-url"); - window.top.reportWindow = jsFrame.create({ - url: reportUrl, - modal: true, - width: 360, - height: 95, + + let replyWindow = window.top.jsFrame.create({ + title: "New Reply", + name: replyWindowName, + width: 385, + height: 350, + url: replyUrl }); - window.top.reportWindow.show(); + replyWindow.show(); } -function onLoad(e) { - window.reportWindow = null; +function getReplyWindow() { + return window.top.jsFrame.getWindowByName(replyWindowName); } +function replyTextbox() { + return $("iframe").contents().find("#id_text"); +} + +function replyAppend(toAdd) { + let textbox = replyTextbox(); + if (textbox.length === 0) { + return; + } + let caret = textbox[0].selectionStart; + let text = textbox.val(); + textbox.val(text.substring(0, caret) + toAdd + text.substring(caret)); + textbox.focus(); +} + +//////////////////////////////////////////////////////////////////////////////// +// Events +//////////////////////////////////////////////////////////////////////////////// + $(document).on("click", documentClick); $(document).on("click", ".post_id", doQuote); -$(window).on("load", () => { - window.reportWindow = null; - window.jsFrame = new JSFrame(); +$(window.top).on("load", () => { + if (typeof window.top.jsFrame === "undefined") { + window.top.jsFrame = new JSFrame(); + } }); window.menuItemFactories = []; @@ -100,5 +109,8 @@ window.menuItemFactories.push( $("") .text("Report") .attr("href", "#") - .on("click", (e) => { openReportWindow(e, postElement); }) + .on("click", (e) => { + e.preventDefault(); + openReportWindow($(postElement).attr("data-report-url")); + }) ); \ No newline at end of file diff --git a/board/static/board/report_window.js b/board/static/board/report_window.js new file mode 100644 index 0000000..3703246 --- /dev/null +++ b/board/static/board/report_window.js @@ -0,0 +1,20 @@ +const reportWindowName = "report-window" + +function getReportWindow() { + return window.top.jsFrame.getWindowByName(reportWindowName); +} + +function openReportWindow(reportUrl) { + // If there's already a report window open, close it and open this one. + if (window.top.jsFrame.containsWindowName(reportWindowName)) { + getReportWindow().closeFrame(); + } + let reportWindow = window.top.jsFrame.create({ + url: reportUrl, + name: reportWindowName, + modal: true, + width: 360, + height: 95, + }); + reportWindow.show(); +} \ No newline at end of file diff --git a/board/static/board/winbox.bundle.js b/board/static/board/winbox.bundle.js deleted file mode 100644 index d3379a8..0000000 --- a/board/static/board/winbox.bundle.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - * WinBox.js v0.2.1 (Bundle) - * Copyright 2021 Nextapps GmbH - * Author: Thomas Wilkerling - * Licence: Apache-2.0 - * https://github.com/nextapps-de/winbox - */ -(function(){'use strict';var g,k=document.createElement("style");k.innerHTML="@keyframes wb-fade-in{0%{opacity:0}to{opacity:.85}}.no-move:not(.min) .wb-title,.winbox.max .wb-body~div,.winbox.min .wb-body~div,.winbox.modal .wb-body~div,.winbox.modal .wb-title,body.wb-drag iframe{pointer-events:none}.winbox{position:fixed;left:0;top:0;background:#0050ff;box-shadow:0 14px 28px rgba(0,0,0,.25),0 10px 10px rgba(0,0,0,.22);transition:width .3s,height .3s,transform .3s;transition-timing-function:cubic-bezier(.3,1,.3,1);will-change:transform,width,height;contain:layout size;text-align:left;touch-action:none;min-height:35px}.wb-header,.wb-icon{height:35px}.wb-n,.wb-s{left:0;height:10px;position:absolute}.wb-body{top:35px}.wb-header,.winbox iframe{position:absolute;width:100%}.wb-header{left:0;top:0;color:#fff;overflow:hidden;z-index:1}.wb-body{position:absolute;left:0;right:0;bottom:0;overflow:auto;-webkit-overflow-scrolling:touch;overflow-scrolling:touch;will-change:contents;background:#fff;margin-top:0!important;contain:strict}.wb-title{line-height:35px;font-family:Arial,sans-serif;font-size:14px;padding-left:10px;cursor:move;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.wb-n{top:-5px;right:0;cursor:n-resize}.wb-e{position:absolute;top:0;right:-5px;bottom:0;width:10px;cursor:w-resize}.wb-s,.wb-se,.wb-sw{bottom:-5px}.wb-s{right:0;cursor:n-resize}.wb-w{position:absolute;top:0;left:-5px;bottom:0;width:10px;cursor:w-resize}.wb-ne,.wb-nw,.wb-sw{width:15px;height:15px;position:absolute}.wb-nw{top:-5px;left:-5px;cursor:nw-resize}.wb-ne,.wb-sw{cursor:ne-resize}.wb-ne{top:-5px;right:-5px}.wb-sw{left:-5px}.wb-se{position:absolute;right:-5px;width:15px;height:15px;cursor:nw-resize}.wb-icon{float:right;max-width:100%;text-align:center}.wb-icon *{display:inline-block;width:30px;height:100%;background-position:center;background-repeat:no-repeat;cursor:pointer;max-width:100%}.no-close .wb-close,.no-full .wb-full,.no-header .wb-header,.no-max .wb-max,.no-min .wb-min,.no-resize .wb-body~div,.winbox.hide,.winbox.min .wb-body>*,.winbox.min .wb-full,.winbox.min .wb-min,.winbox.modal .wb-full,.winbox.modal .wb-max,.winbox.modal .wb-min{display:none}.winbox.max .wb-title,.winbox.min .wb-title{cursor:default}.wb-min{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAyIj48cGF0aCBmaWxsPSIjZmZmIiBkPSJNOCAwaDdhMSAxIDAgMCAxIDAgMkgxYTEgMSAwIDAgMSAwLTJoN3oiLz48L3N2Zz4=);background-size:14px auto;background-position:center bottom 11px}.wb-max{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9IiNmZmYiIHZpZXdCb3g9IjAgMCA5NiA5NiI+PHBhdGggZD0iTTIwIDcxLjMxMUMxNS4zNCA2OS42NyAxMiA2NS4yMyAxMiA2MFYyMGMwLTYuNjMgNS4zNy0xMiAxMi0xMmg0MGM1LjIzIDAgOS42NyAzLjM0IDExLjMxMSA4SDI0Yy0yLjIxIDAtNCAxLjc5LTQgNHY1MS4zMTF6Ii8+PHBhdGggZD0iTTkyIDc2VjM2YzAtNi42My01LjM3LTEyLTEyLTEySDQwYy02LjYzIDAtMTIgNS4zNy0xMiAxMnY0MGMwIDYuNjMgNS4zNyAxMiAxMiAxMmg0MGM2LjYzIDAgMTItNS4zNyAxMi0xMnptLTUyIDRjLTIuMjEgMC00LTEuNzktNC00VjM2YzAtMi4yMSAxLjc5LTQgNC00aDQwYzIuMjEgMCA0IDEuNzkgNCA0djQwYzAgMi4yMS0xLjc5IDQtNCA0SDQweiIvPjwvc3ZnPg==);background-size:17px auto}.wb-close{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0xIC0xIDE4IDE4Ij48cGF0aCBmaWxsPSIjZmZmIiBkPSJtMS42MTMuMjEuMDk0LjA4M0w4IDYuNTg1IDE0LjI5My4yOTNsLjA5NC0uMDgzYTEgMSAwIDAgMSAxLjQwMyAxLjQwM2wtLjA4My4wOTRMOS40MTUgOGw2LjI5MiA2LjI5M2ExIDEgMCAwIDEtMS4zMiAxLjQ5N2wtLjA5NC0uMDgzTDggOS40MTVsLTYuMjkzIDYuMjkyLS4wOTQuMDgzQTEgMSAwIDAgMSAuMjEgMTQuMzg3bC4wODMtLjA5NEw2LjU4NSA4IC4yOTMgMS43MDdBMSAxIDAgMCAxIDEuNjEzLjIxeiIvPjwvc3ZnPg==);background-size:15px auto}.wb-full{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2Utd2lkdGg9IjIuNSIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBkPSJNOCAzSDVhMiAyIDAgMCAwLTIgMnYzbTE4IDBWNWEyIDIgMCAwIDAtMi0yaC0zbTAgMThoM2EyIDIgMCAwIDAgMi0ydi0zTTMgMTZ2M2EyIDIgMCAwIDAgMiAyaDMiLz48L3N2Zz4=);background-size:16px auto}.winbox.hide{visibility:hidden}.max{box-shadow:none}.max .wb-body{margin:0!important}.winbox iframe{height:100%;border:0}.no-animation,body.wb-drag .winbox{transition:none}.winbox.modal:before{content:'';position:absolute;top:0;left:0;right:0;bottom:0;background:inherit;border-radius:inherit}.winbox.modal:after{content:'';position:absolute;top:-100vh;left:-100vw;right:-100vw;bottom:-100vh;background:#0d1117;animation:wb-fade-in .2s ease-out forwards;z-index:-1}.no-shadow{box-shadow:none}.no-header .wb-body{top:0}"; -var l=document.getElementsByTagName("head")[0];l.firstChild?l.insertBefore(k,l.firstChild):l.appendChild(k);var m=document.createElement("div");m.innerHTML="
";function n(a,b,c,e){a.addEventListener(b,c,e||!1===e?e:!0)}function r(a){a.stopPropagation();a.cancelable&&a.preventDefault()}function w(a,b,c){c=""+c;a["_s_"+b]!==c&&(a.style.setProperty(b,c),a["_s_"+b]=c)};var y=[],z,C=0,D=0,E,F,G,K,O,Q,R; -function T(a,b){if(!(this instanceof T))return new T(a);E||aa();var c,e;if(a){if(b){var d=a;a=b}if("string"===typeof a)d=a;else{if(e=a.modal)var h=c="center";var p=a.id;var t=a.root;var H=a.template;d=d||a.title;var f=a.mount;var q=a.html;var x=a.url;var u=a.width;var v=a.height;var A=a.minwidth;var B=a.minheight;h=a.x||h;c=a.y||c;var L=a.max;var ba=a.hidden;var I=a.top;var J=a.left;var M=a.bottom;var N=a.right;E=a.index||E;var ca=a.onclose;var da=a.onfocus;var ea=a.onblur;var fa=a.onmove;var ha= -a.onresize;var X=a.background;var S=a.border;var P=a["class"];var ia=a.splitscreen}}this.g=H?H:m.cloneNode(!0);this.body=this.g.getElementsByClassName("wb-body")[0];X&&this.setBackground(X);S&&w(this.body,"margin",S+(isNaN(S)?"":"px"));this.setTitle(d||"");a=Q;b=R;I=I?U(I,b):0;M=M?U(M,b):0;J=J?U(J,a):0;N=N?U(N,a):0;a-=J+N;b-=I+M;u=u?U(u,a):a/2|0;v=v?U(v,b):b/2|0;A=A?U(A,a):0;B=B?U(B,b):0;h=h?U(h,a,u):J;c=c?U(c,b,v):I;E=E||10;this.g.id=this.id=p||"winbox-"+ ++C;this.g.className="winbox"+(P?" "+("string"=== -typeof P?P:P.join(" ")):"")+(e?" modal":"");this.x=h;this.y=c;this.width=u;this.height=v;this.j=A;this.i=B;this.top=I;this.right=N;this.bottom=M;this.left=J;this.max=this.min=!1;this.onclose=ca;this.onfocus=da;this.onblur=ea;this.onmove=fa;this.onresize=ha;this.l=ia;L?this.maximize():this.move().resize();f?this.mount(f):q?this.body.innerHTML=q:x&&this.setUrl(x);ba?this.hide():this.focus();this.g.winbox=this;ja(this);(t||z).appendChild(this.g)}T["new"]=function(a){return new T(a)}; -function U(a,b,c){"string"===typeof a&&("center"===a?a=(b-c)/2|0:"right"===a||"bottom"===a?a=b-c:(c=parseFloat(a),a="%"===(""+c!==a&&a.substring((""+c).length))?b/100*c|0:c));return a} -function aa(){z=document.body;z[K="requestFullscreen"]||z[K="msRequestFullscreen"]||z[K="webkitRequestFullscreen"]||z[K="mozRequestFullscreen"]||(K="");O=K&&K.replace("request","exit").replace("mozRequest","mozCancel").replace("Request","Exit");n(window,"resize",function(){Q=z.clientWidth;R=z.clientHeight;V()});Q=z.clientWidth;R=z.clientHeight} -function ja(a){W(a,"title");W(a,"n");W(a,"s");W(a,"w");W(a,"e");W(a,"nw");W(a,"ne");W(a,"se");W(a,"sw");n(a.g.getElementsByClassName("wb-min")[0],"click",function(b){r(b);a.minimize()});n(a.g.getElementsByClassName("wb-max")[0],"click",function(b){r(b);a.focus().maximize()});K?n(a.g.getElementsByClassName("wb-full")[0],"click",function(b){r(b);a.focus().fullscreen()}):a.addClass("no-full");n(a.g.getElementsByClassName("wb-close")[0],"click",function(b){r(b);a.close()||(a=null)});n(a.g,"click",function(){a.focus()}, -!1)}function Y(a){y.splice(y.indexOf(a),1);V();a.removeClass("min");a.min=!1;a.g.title=""}function V(){for(var a=y.length,b={},c={},e=0,d;ex){a.maximize();return}}a.max||(z.classList.add("wb-drag"),(p=f.touches)&&(p=p[0])?(f=p,n(window,"touchmove",e),n(window,"touchend",d)):(n(window,"mousemove",e),n(window,"mouseup",d)),t=f.pageX,H=f.pageY,a.focus())}}function e(f){r(f);p&&(f=f.touches[0]);var q=f.pageX;f=f.pageY;var x=q-t,u=f-H,v;if("title"===b){a.x+=x;a.y+=u;var A=v=1}else{if("e"=== -b||"se"===b||"ne"===b){a.width+=x;var B=1}else if("w"===b||"sw"===b||"nw"===b)a.x+=x,a.width-=x,A=B=1;if("s"===b||"se"===b||"sw"===b){a.height+=u;var L=1}else if("n"===b||"ne"===b||"nw"===b)a.y+=u,a.height-=u,v=L=1}if(B||L)B&&(a.width=Math.max(Math.min(a.width,Q-a.x-a.right),150)),L&&(a.height=Math.max(Math.min(a.height,R-a.y-a.bottom),0)),a.resize();if(A||v)A&&(a.x=Math.max(Math.min(a.x,Q-a.width-a.right),a.left)),v&&(a.y=Math.max(Math.min(a.y,R-a.height-a.bottom),a.top)),a.move();t=q;H=f}function d(f){r(f); -z.classList.remove("wb-drag");p?(window.removeEventListener("touchmove",e,!0),window.removeEventListener("touchend",d,!0)):(window.removeEventListener("mousemove",e,!0),window.removeEventListener("mouseup",d,!0))}var h=a.g.getElementsByClassName("wb-"+b)[0],p,t,H;n(h,"mousedown",c);n(h,"touchstart",c,{passive:!1})}g=T.prototype;g.mount=function(a){this.unmount();a.h||(a.h=a.parentNode);this.body.textContent="";this.body.appendChild(a);return this}; -g.unmount=function(a){var b=this.body.firstChild;if(b){var c=a||b.h;c&&c.appendChild(b);b.h=a}return this};g.setTitle=function(a){a=this.title=a;this.g.getElementsByClassName("wb-title")[0].firstChild.nodeValue=a;return this};g.setBackground=function(a){w(this.g,"background",a);return this};g.setUrl=function(a){this.body.innerHTML='';return this}; -g.focus=function(){G!==this&&(w(this.g,"z-index",E++),this.addClass("focus"),G&&(G.removeClass("focus"),G.onblur&&G.onblur()),G=this,this.onfocus&&this.onfocus());return this};g.hide=function(){return this.addClass("hide")};g.show=function(){return this.removeClass("hide")};g.minimize=function(a){F&&Z();!a&&this.min?(Y(this),this.resize().move().focus()):!1===a||this.min||(y.push(this),V(),this.g.title=this.title,this.addClass("min"),this.min=!0);this.max&&(this.removeClass("max"),this.max=!1);return this}; -g.maximize=function(a){if("undefined"===typeof a||a!==this.max)this.min&&Y(this),(this.max=!this.max)?this.addClass("max").resize(Q-this.left-this.right,R-this.top-this.bottom,!0).move(this.left,this.top,!0):this.resize().move().removeClass("max");return this};g.fullscreen=function(a){if("undefined"===typeof a||a!==F)this.min&&(this.resize().move(),Y(this)),F&&Z()||(this.body[K](),F=!0);return this}; -function Z(){F=!1;if(document.fullscreen||document.fullscreenElement||document.webkitFullscreenElement||document.mozFullScreenElement)return document[O](),!0}g.close=function(a){if(this.onclose&&this.onclose(a))return!0;this.min&&Y(this);this.unmount();this.g.parentNode.removeChild(this.g);G===this&&(G=null)}; -g.move=function(a,b,c){a||0===a?c||(this.x=a?a=U(a,Q-this.left-this.right,this.width):0,this.y=b?b=U(b,R-this.top-this.bottom,this.height):0):(a=this.x,b=this.y,this.l&&(0===a?this.resize(Q/2,R):a===Q-this.width&&this.resize(Q/2,R)));w(this.g,"transform","translate("+a+"px,"+b+"px)");this.onmove&&this.onmove(a,b);return this}; -g.resize=function(a,b,c){a||0===a?c||(this.width=a?a=U(a,Q-this.left-this.right):0,this.height=b?b=U(b,R-this.top-this.bottom):0):(a=this.width,b=this.height);a=Math.max(a,this.j);b=Math.max(b,this.i);w(this.g,"width",a+"px");w(this.g,"height",b+"px");this.onresize&&this.onresize(a,b);return this};g.addClass=function(a){this.g.classList.add(a);return this};g.removeClass=function(a){this.g.classList.remove(a);return this};window.WinBox=T;}).call(this); diff --git a/board/templates/admin/board/reportrecord/change_list.html b/board/templates/admin/board/reportrecord/change_list.html index 701d331..651caf2 100644 --- a/board/templates/admin/board/reportrecord/change_list.html +++ b/board/templates/admin/board/reportrecord/change_list.html @@ -31,19 +31,21 @@ {% block extrahead %} {{block.super}} - + {% endblock extrahead %} {% block footer %} {{block.super}} {% endblock %} \ No newline at end of file diff --git a/board/templates/board/ban_success.html b/board/templates/board/ban_success.html index c242e70..7762141 100644 --- a/board/templates/board/ban_success.html +++ b/board/templates/board/ban_success.html @@ -1,7 +1,11 @@ {% extends "board/base.html" %} -{% load i18n %} +{% load i18n static %} {# Title #} {% block title %}{% translate "Ban success" %}{% endblock %} +{# Extra JS #} +{% block extrajs %} + +{% endblock extrajs %} {# Body #} {% block content %}
@@ -20,7 +24,10 @@ function isIframe() { setTimeout(function() { if(isIframe()) { - window.top.banWindow.close(); + let banWindow = getBanWindow(); + if(banWindow) { + banWindow.closeFrame(); + } } else { window.close(); } diff --git a/board/templates/board/post_detail.html b/board/templates/board/post_detail.html index dd9135f..c1900e7 100644 --- a/board/templates/board/post_detail.html +++ b/board/templates/board/post_detail.html @@ -1,6 +1,5 @@ {% extends "board/base.html" %} -{% load post_body %} -{% load i18n %} +{% load i18n post_body static %} {% block title %} {% with title=board.url %} @@ -8,6 +7,10 @@ {% endwith %} {% endblock title %} +{% block extrajs %} + +{% endblock extrajs %} + {% block content %} {# board header #}
@@ -59,49 +62,13 @@ +{% endblock extrajs %} {# Body #} {% block content %}
@@ -20,8 +24,9 @@ function isIframe() { setTimeout(function() { if(isIframe()) { - if(typeof window.top.reportWindow !== "undefined" && window.top.reportWindow) { - window.top.reportWindow.closeFrame(); + let reportWindow = getReportWindow(); + if(reportWindow) { + reportWindow.closeFrame(); } } else { window.close();