This commit is contained in:
Aevann1 2021-10-04 01:02:41 +02:00
parent 52d70d5ef6
commit f6667ed942
16 changed files with 23 additions and 28 deletions

View file

@ -39,7 +39,7 @@ function post_toast2(url, button1, button2) {
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
document.getElementById('toast-post-error-text').innerText = "Error. Try again later."; document.getElementById('toast-post-error-text').innerText = "Error. Please try again later.";
return false return false
} }
} }

View file

@ -53,7 +53,7 @@ function post_toast3(url, button1, button2) {
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
document.getElementById('toast-post-error-text').innerText = "Error. Try again later."; document.getElementById('toast-post-error-text').innerText = "Error. Please try again later.";
return false return false
} }
}; };
@ -167,11 +167,11 @@ post_reply=function(id){
myToast.show(); myToast.show();
} }
else { else {
var commentError = document.getElementById("comment-error-text");
var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-success'));
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
document.getElementById("comment-error-text").textContent = "Error. Please try again later.";
} }
} }
xhr.send(form) xhr.send(form)
@ -182,8 +182,6 @@ post_reply=function(id){
comment_edit=function(id){ comment_edit=function(id){
var commentError = document.getElementById("comment-error-text");
var form = new FormData(); var form = new FormData();
form.append('formkey', formkey()); form.append('formkey', formkey());
@ -208,14 +206,14 @@ comment_edit=function(id){
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
commentError.textContent = JSON.parse(xhr.response)["error"]; document.getElementById("comment-error-text").textContent = "Error. Please try again later.";
} }
} }
xhr.send(form) xhr.send(form)
} }
post_comment=function(fullname, postId){ post_comment=function(fullname){
var form = new FormData(); var form = new FormData();
@ -238,12 +236,11 @@ post_comment=function(fullname, postId){
myToast.show(); myToast.show();
} }
else { else {
var commentError = document.getElementById("comment-error-text");
var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-success'));
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
commentError.textContent = JSON.parse(xhr.response)["error"]; document.getElementById("comment-error-text").textContent = "Error. Please try again later.";
} }
} }
xhr.send(form) xhr.send(form)

View file

@ -124,7 +124,7 @@ function post_toast2(url, button1, button2) {
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
document.getElementById('toast-post-error-text').innerText = "Error. Try again later."; document.getElementById('toast-post-error-text').innerText = "Error. Please try again later.";
return false return false
} }
} }

View file

@ -48,7 +48,7 @@ function post_toast(url, reload, data) {
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
document.getElementById('toast-post-error-text').innerText = "Error. Try again later."; document.getElementById('toast-post-error-text').innerText = "Error. Please try again later.";
return false return false
} }
} }

View file

@ -47,7 +47,7 @@ function post_toast_callback(url, data, callback) {
} }
return false return false
} catch(e) { } catch(e) {
document.getElementById('toast-post-error-text').innerText = "Error. Try again later."; document.getElementById('toast-post-error-text').innerText = "Error. Please try again later.";
} }
return false; return false;

View file

@ -3,7 +3,7 @@
{% block pagetitle %}Changelog{% endblock %} {% block pagetitle %}Changelog{% endblock %}
{% block desktopBanner %} {% block desktopBanner %}
<script src="/assets/js/changelog.js"></script> <script src="/assets/js/changelog.js?v=1"></script>
<div class="row" style="overflow: visible;padding-top:5px;"> <div class="row" style="overflow: visible;padding-top:5px;">
<div class="col"> <div class="col">

View file

@ -33,14 +33,14 @@
{% if v %} {% if v %}
{% include "award_modal.html" %} {% include "award_modal.html" %}
<script src="/assets/js/comments_v.js?v=2"></script> <script src="/assets/js/comments_v.js?v=3"></script>
{% endif %} {% endif %}
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
{% if v and v.admin_level == 6 %} {% if v and v.admin_level == 6 %}
<script src="/assets/js/comments_admin.js"></script> <script src="/assets/js/comments_admin.js?v=1"></script>
{% endif %} {% endif %}
<script> <script>

View file

@ -67,7 +67,7 @@
{% if v %} {% if v %}
<script>function formkey() {return '{{v.formkey}}';}</script> <script>function formkey() {return '{{v.formkey}}';}</script>
<script src="/assets/js/default.js?v=1"></script> <script src="/assets/js/default.js?v=2"></script>
{% endif %} {% endif %}

View file

@ -1,4 +1,4 @@
<script src="/assets/js/gif_modal.js"></script> <script src="/assets/js/gif_modal.js?v=1"></script>
<div class="modal fade" id="gifModal" tabindex="-1" role="dialog" aria-labelledby="gifModalTitle" aria-hidden="true"> <div class="modal fade" id="gifModal" tabindex="-1" role="dialog" aria-labelledby="gifModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-5" role="document"> <div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-5" role="document">

View file

@ -1,4 +1,4 @@
<script src="/assets/js/header.js"></script> <script src="/assets/js/header.js?v=1"></script>
<nav class="shadow shadow-md fixed-top"> <nav class="shadow shadow-md fixed-top">
{% if "rdrama" in request.host %} {% if "rdrama" in request.host %}

View file

@ -1,4 +1,4 @@
<script src="/assets/js/mobile_navigation_bar.js"></script> <script src="/assets/js/mobile_navigation_bar.js?v=1"></script>
<style> <style>
.btn-dead:hover, .active.btn-dead:hover, .active.btn-dead { .btn-dead:hover, .active.btn-dead:hover, .active.btn-dead {

View file

@ -10,8 +10,6 @@
var exileForm = document.getElementById("exile-form"); var exileForm = document.getElementById("exile-form");
var exileError = document.getElementById("toast-error-message");
var usernameField = document.getElementById("exile-username"); var usernameField = document.getElementById("exile-username");
var isValidUsername = usernameField.checkValidity(); var isValidUsername = usernameField.checkValidity();
@ -35,7 +33,7 @@
myToast.hide(); myToast.hide();
var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
myToast.show(); myToast.show();
exileError.textContent = JSON.parse(xhr.response)["error"]; document.getElementById("toast-error-message").textContent = "Error. Please try again later.";
} }
} }
xhr.send(f) xhr.send(f)

View file

@ -6,7 +6,7 @@
{% include "emoji_modal.html" %} {% include "emoji_modal.html" %}
{% include "gif_modal.html" %} {% include "gif_modal.html" %}
<script src="/assets/js/setting_profile.js"></script> <script src="/assets/js/setting_profile.js?v=1"></script>
<div id="posts" class="row"> <div id="posts" class="row">

View file

@ -4,7 +4,7 @@
<head> <head>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="/assets/js/signup.js"></script> <script src="/assets/js/signup.js?v=1"></script>
{% if hcaptcha %} {% if hcaptcha %}
<script src="https://hcaptcha.com/1/api.js"></script> <script src="https://hcaptcha.com/1/api.js"></script>

View file

@ -36,7 +36,7 @@
{% if 'marsey.tech' in request.host %} {% if 'marsey.tech' in request.host %}
{% if v %} {% if v %}
<script src="/assets/js/comments_v.js?v=2"></script> <script src="/assets/js/comments_v.js?v=3"></script>
{% include "award_modal.html" %} {% include "award_modal.html" %}
{% include "emoji_modal.html" %} {% include "emoji_modal.html" %}
{% include "gif_modal.html" %} {% include "gif_modal.html" %}
@ -48,7 +48,7 @@
{% endif %} {% endif %}
{% if p.award_count("shit") %} {% if p.award_count("shit") %}
<script src="/assets/js/bug-min.js"></script> <script src="/assets/js/bug-min.js?v=1"></script>
{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %} {% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %} {% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
<script> <script>
@ -64,7 +64,7 @@
{% if p.award_count("fireflies") %} {% if p.award_count("fireflies") %}
<script src="/assets/js/fireflies.js"></script> <script src="/assets/js/fireflies.js?v=1"></script>
{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %} {% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %} {% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
<script> <script>

View file

@ -18,7 +18,7 @@
{% block pagetype %}userpage{% endblock %} {% block pagetype %}userpage{% endblock %}
{% block title %} {% block title %}
<script src="/assets/js/userpage.js?v=1"></script> <script src="/assets/js/userpage.js?v=2"></script>
<title>{{u.username}}'s profile - {{'SITE_NAME' | app_config}}</title> <title>{{u.username}}'s profile - {{'SITE_NAME' | app_config}}</title>
{% if u.is_private %} {% if u.is_private %}
<meta name="robots" content="noindex"> <meta name="robots" content="noindex">