From ab8b4b95249ab0cfb364cac1dddb267005099a29 Mon Sep 17 00:00:00 2001 From: towards-a-new-leftypol Date: Sun, 27 Jun 2021 01:09:28 +0000 Subject: [PATCH 1/3] defer additional_javascript - this required a fix to file-selector --- js/file-selector.js | 41 ++++++++++++++++++++++------------------ templates/header.html | 2 +- templates/post_form.html | 10 +++++++--- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/js/file-selector.js b/js/file-selector.js index c2b5381b..a14a9167 100644 --- a/js/file-selector.js +++ b/js/file-selector.js @@ -8,24 +8,6 @@ */ function init_file_selector(max_images) { -$(document).ready(function () { - // add options panel item - if (window.Options && Options.get_tab('general')) { - Options.extend_tab('general', ''); - - $('#file-drag-drop>input').on('click', function() { - if ($('#file-drag-drop>input').is(':checked')) { - localStorage.file_dragdrop = 'true'; - } else { - localStorage.file_dragdrop = 'false'; - } - }); - - if (typeof localStorage.file_dragdrop === 'undefined') localStorage.file_dragdrop = 'true'; - if (localStorage.file_dragdrop === 'true') $('#file-drag-drop>input').prop('checked', true); - } -}); - // disabled by user, or incompatible browser. if (localStorage.file_dragdrop == 'false' || !(window.URL.createObjectURL && window.File)) return; @@ -190,3 +172,26 @@ $(document).on('paste', function (e) { }); } + +$(document).ready(function () { + // add options panel item + if (window.Options && Options.get_tab('general')) { + Options.extend_tab('general', ''); + + $('#file-drag-drop>input').on('click', function() { + if ($('#file-drag-drop>input').is(':checked')) { + localStorage.file_dragdrop = 'true'; + } else { + localStorage.file_dragdrop = 'false'; + } + }); + + if (typeof localStorage.file_dragdrop === 'undefined') localStorage.file_dragdrop = 'true'; + if (localStorage.file_dragdrop === 'true') $('#file-drag-drop>input').prop('checked', true); + } +}); + +$(document).ready(function () { + var maxImages = document.querySelector("form[name=post]").dataset.maxImages; + init_file_selector(new Number(maxImages)); +}); diff --git a/templates/header.html b/templates/header.html index 6c1e6346..d4ef94e0 100644 --- a/templates/header.html +++ b/templates/header.html @@ -17,7 +17,7 @@ {% if not nojavascript %} {% if not config.additional_javascript_compile %} - {% for javascript in config.additional_javascript %}{% endfor %} + {% for javascript in config.additional_javascript %}{% endfor %} {% endif %} {% endif %} {% if config.recaptcha %} diff --git a/templates/post_form.html b/templates/post_form.html index 1bcd1a72..f70871d4 100644 --- a/templates/post_form.html +++ b/templates/post_form.html @@ -1,4 +1,10 @@ -
+ {{ antibot.html() }} {% if id %}{% endif %} {{ antibot.html() }} @@ -142,8 +148,6 @@ - - {% if config.allow_upload_by_url %}
: From 5b6233f18725423012125a32cf485c91fd4ba856 Mon Sep 17 00:00:00 2001 From: towards-a-new-leftypol Date: Sun, 27 Jun 2021 01:40:57 +0000 Subject: [PATCH 2/3] fix document ready --- js/catalog-search.js | 3 ++- js/download-original.js | 2 +- js/expand-all-images.js | 2 +- js/expand-video.js | 2 +- js/flag-preview.js | 2 +- js/inline-expanding-filename.js | 2 +- js/post-hover.js | 2 +- js/show-backlinks.js | 2 +- js/smartphone-spoiler.js | 2 +- js/style-select.js | 2 +- js/youtube.js | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/js/catalog-search.js b/js/catalog-search.js index fc39b1ce..34196210 100644 --- a/js/catalog-search.js +++ b/js/catalog-search.js @@ -59,7 +59,8 @@ var searchThreads = function($threads, query) { // Only load in the catalog if (active_page == 'catalog') { - onready(catalogSearch); + + $(document).ready(catalogSearch); } }()); diff --git a/js/download-original.js b/js/download-original.js index cf9635ac..9fde68f5 100644 --- a/js/download-original.js +++ b/js/download-original.js @@ -15,7 +15,7 @@ * */ -onready(function(){ +$(document).ready(function(){ var do_original_filename = function() { var filename, truncated; if ($(this).attr('title')) { diff --git a/js/expand-all-images.js b/js/expand-all-images.js index c110f51c..64394beb 100644 --- a/js/expand-all-images.js +++ b/js/expand-all-images.js @@ -17,7 +17,7 @@ */ if (active_page == 'ukko' || active_page == 'thread' || active_page == 'index') -onready(function(){ +$(document).ready(function(){ $('hr:first').before('
'); $('div#expand-all-images a') .text(_('Expand all images')) diff --git a/js/expand-video.js b/js/expand-video.js index eb26cbed..421676c4 100644 --- a/js/expand-video.js +++ b/js/expand-video.js @@ -216,7 +216,7 @@ function setupVideosIn(element) { } } -onready(function(){ +$(document).ready(function(){ // Insert menu from settings.js if (typeof settingsMenu != "undefined" && typeof Options == "undefined") { var firsthr = document.getElementsByTagName("hr")[0]; diff --git a/js/flag-preview.js b/js/flag-preview.js index c7a6b986..6a4d8943 100644 --- a/js/flag-preview.js +++ b/js/flag-preview.js @@ -26,7 +26,7 @@ function updatePreviewWithSelected(img, select) { img.attr("src", getFlagUrl(select.find(":selected").val())); } -onready(function(){ +$(document).ready(function(){ var flagImg = $('#flag_preview'); var flagSelect = $('#user_flag'); var loaded = loadFlag(); diff --git a/js/inline-expanding-filename.js b/js/inline-expanding-filename.js index ac79fcf0..fd618296 100644 --- a/js/inline-expanding-filename.js +++ b/js/inline-expanding-filename.js @@ -13,7 +13,7 @@ * */ -onready(function(){ +$(document).ready(function(){ var inline_expanding_filename = function() { $(this).find(".fileinfo > a").click(function(){ var imagelink = $(this).parent().parent().find('a[target="_blank"]:first'); diff --git a/js/post-hover.js b/js/post-hover.js index b9987c8e..6ecd4c21 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -13,7 +13,7 @@ * */ -onready(function(){ +$(document).ready(function () { var dont_fetch_again = []; init_hover = function() { var $link = $(this); diff --git a/js/show-backlinks.js b/js/show-backlinks.js index fa4865fd..d32cf803 100644 --- a/js/show-backlinks.js +++ b/js/show-backlinks.js @@ -13,7 +13,7 @@ * */ -onready(function(){ +$(document).ready(function(){ var showBackLinks = function() { var reply_id = $(this).attr('id').replace(/^reply_/, ''); diff --git a/js/smartphone-spoiler.js b/js/smartphone-spoiler.js index 05273c19..aa7f4b0a 100644 --- a/js/smartphone-spoiler.js +++ b/js/smartphone-spoiler.js @@ -12,7 +12,7 @@ * */ -onready(function(){ +$(document).ready(function(){ if(device_type == 'mobile') { var fix_spoilers = function(where) { var spoilers = where.getElementsByClassName('spoiler'); diff --git a/js/style-select.js b/js/style-select.js index e9d395f0..e47600a5 100644 --- a/js/style-select.js +++ b/js/style-select.js @@ -14,7 +14,7 @@ * */ -onready(function(){ +$(document).ready(function(){ var stylesDiv = $('div.styles'); var pages = $('div.pages'); var stylesSelect = $(''); diff --git a/js/youtube.js b/js/youtube.js index dc83d10f..414e0bab 100644 --- a/js/youtube.js +++ b/js/youtube.js @@ -23,7 +23,7 @@ */ -onready(function(){ +$(document).ready(function(){ const ON = "[Remove]"; const OFF = "[Embed]"; From 0530209d871e13f89ba405b63ec6cf8843970f9c Mon Sep 17 00:00:00 2001 From: towards-a-new-leftypol Date: Sat, 3 Jul 2021 19:58:24 -0400 Subject: [PATCH 3/3] fix parsing number from string --- js/file-selector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/file-selector.js b/js/file-selector.js index a14a9167..f90bfd3b 100644 --- a/js/file-selector.js +++ b/js/file-selector.js @@ -193,5 +193,5 @@ $(document).ready(function () { $(document).ready(function () { var maxImages = document.querySelector("form[name=post]").dataset.maxImages; - init_file_selector(new Number(maxImages)); + init_file_selector(Number(maxImages)); });