From 3305da2fef1b8f20d985db8d75a088d5c4c3f91e Mon Sep 17 00:00:00 2001 From: Deimos Date: Mon, 3 Jun 2019 18:04:33 -0600 Subject: [PATCH] Apply ESLint + Prettier to JS files, fix errors --- tildes/static/js/behaviors/auto-focus.js | 9 +- .../js/behaviors/autocomplete-chip-clear.js | 12 +- .../static/js/behaviors/autocomplete-input.js | 208 +++++++++++------- .../js/behaviors/autocomplete-menu-item.js | 69 +++--- .../static/js/behaviors/autocomplete-menu.js | 16 +- .../static/js/behaviors/autoselect-input.js | 4 +- .../js/behaviors/autosubmit-on-change.js | 8 +- tildes/static/js/behaviors/cancel-button.js | 25 ++- .../behaviors/comment-collapse-all-button.js | 27 ++- .../js/behaviors/comment-collapse-button.js | 20 +- .../js/behaviors/comment-expand-all-button.js | 17 +- .../js/behaviors/comment-label-button.js | 69 +++--- .../js/behaviors/comment-parent-button.js | 29 ++- .../js/behaviors/comment-reply-button.js | 60 ++--- .../behaviors/confirm-leave-page-unsaved.js | 8 +- .../js/behaviors/ctrl-enter-submit-form.js | 12 +- .../js/behaviors/external-links-new-tabs.js | 16 +- .../js/behaviors/fadeout-parent-on-success.js | 8 +- .../js/behaviors/hide-sidebar-if-open.js | 8 +- .../hide-sidebar-no-preventdefault.js | 6 +- .../static/js/behaviors/markdown-edit-tab.js | 16 +- .../js/behaviors/markdown-preview-tab.js | 18 +- .../js/behaviors/prevent-double-submit.js | 13 +- tildes/static/js/behaviors/remove-on-click.js | 4 +- .../static/js/behaviors/remove-on-success.js | 4 +- tildes/static/js/behaviors/sidebar-toggle.js | 4 +- tildes/static/js/behaviors/tab.js | 10 +- tildes/static/js/behaviors/theme-selector.js | 38 ++-- .../static/js/behaviors/time-period-select.js | 16 +- tildes/static/js/scripts.js | 117 +++++----- 30 files changed, 502 insertions(+), 369 deletions(-) diff --git a/tildes/static/js/behaviors/auto-focus.js b/tildes/static/js/behaviors/auto-focus.js index cb1cf63..17c408e 100644 --- a/tildes/static/js/behaviors/auto-focus.js +++ b/tildes/static/js/behaviors/auto-focus.js @@ -1,11 +1,14 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-auto-focus]', function() { - $input = $(this); +$.onmount("[data-js-auto-focus]", function() { + var $input = $(this); // just calling .focus() will place the cursor at the start of the field, // so un-setting and re-setting the value moves the cursor to the end var original_val = $input.val(); - $input.focus().val('').val(original_val); + $input + .focus() + .val("") + .val(original_val); }); diff --git a/tildes/static/js/behaviors/autocomplete-chip-clear.js b/tildes/static/js/behaviors/autocomplete-chip-clear.js index e90b3a1..7f3b784 100644 --- a/tildes/static/js/behaviors/autocomplete-chip-clear.js +++ b/tildes/static/js/behaviors/autocomplete-chip-clear.js @@ -1,13 +1,13 @@ // Copyright (c) 2019 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-autocomplete-chip-clear]', function() { +$.onmount("[data-js-autocomplete-chip-clear]", function() { function clearChip($chip) { - var $tagsHiddenInput = $('[data-js-autocomplete-hidden-input]'); - var $autocompleteInput = $('[data-js-autocomplete-input]'); + var $tagsHiddenInput = $("[data-js-autocomplete-hidden-input]"); + var $autocompleteInput = $("[data-js-autocomplete-input]"); - var textToReplace = new RegExp($chip.text() + ','); - $tagsHiddenInput.val($tagsHiddenInput.val().replace(textToReplace, '')); + var textToReplace = new RegExp($chip.text() + ","); + $tagsHiddenInput.val($tagsHiddenInput.val().replace(textToReplace, "")); $chip.remove(); $autocompleteInput.focus(); } @@ -19,7 +19,7 @@ $.onmount('[data-js-autocomplete-chip-clear]', function() { $(this).keydown(function(event) { switch (event.key) { - case 'Backspace': + case "Backspace": event.preventDefault(); clearChip($(this).parent()); break; diff --git a/tildes/static/js/behaviors/autocomplete-input.js b/tildes/static/js/behaviors/autocomplete-input.js index 0549bef..910094d 100644 --- a/tildes/static/js/behaviors/autocomplete-input.js +++ b/tildes/static/js/behaviors/autocomplete-input.js @@ -1,38 +1,47 @@ // Copyright (c) 2019 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-autocomplete-input]', function() { +$.onmount("[data-js-autocomplete-input]", function() { function addChip($input) { - var $autocompleteContainer = $input.parents('[data-js-autocomplete-container]').first(); - var $chips = $autocompleteContainer.find('[data-js-autocomplete-chips]').first(); - var $tagsHiddenInput = $('[data-js-autocomplete-hidden-input]'); - - $input.val().split(',').map(function(tag) { - return tag.trim(); - }).filter(function(tag) { - return tag !== ''; - }).forEach(function(tag) { - if (!$tagsHiddenInput.val().match(new RegExp('(^|,)' + tag + ','))) { - var clearIcon = document.createElement('a'); - clearIcon.classList.add('btn'); - clearIcon.classList.add('btn-clear'); - clearIcon.setAttribute('data-js-autocomplete-chip-clear', ''); - clearIcon.setAttribute('aria-label', 'Close'); - clearIcon.setAttribute('role', 'button'); - clearIcon.setAttribute('tabindex', $chips.children().length); - - var $chip = $(document.createElement('div')); - $chip.addClass('chip'); - $chip.html(tag); - $chip.append(clearIcon); - - $chips.append($chip); - - $tagsHiddenInput.val($tagsHiddenInput.val() + tag + ','); - } - }); - $autocompleteContainer.find('[data-js-autocomplete-input]').val(''); - $autocompleteContainer.find('[data-js-autocomplete-suggestions]').html(''); + var $autocompleteContainer = $input + .parents("[data-js-autocomplete-container]") + .first(); + var $chips = $autocompleteContainer + .find("[data-js-autocomplete-chips]") + .first(); + var $tagsHiddenInput = $("[data-js-autocomplete-hidden-input]"); + + $input + .val() + .split(",") + .map(function(tag) { + return tag.trim(); + }) + .filter(function(tag) { + return tag !== ""; + }) + .forEach(function(tag) { + if (!$tagsHiddenInput.val().match(new RegExp("(^|,)" + tag + ","))) { + var clearIcon = document.createElement("a"); + clearIcon.classList.add("btn"); + clearIcon.classList.add("btn-clear"); + clearIcon.setAttribute("data-js-autocomplete-chip-clear", ""); + clearIcon.setAttribute("aria-label", "Close"); + clearIcon.setAttribute("role", "button"); + clearIcon.setAttribute("tabindex", $chips.children().length); + + var $chip = $(document.createElement("div")); + $chip.addClass("chip"); + $chip.html(tag); + $chip.append(clearIcon); + + $chips.append($chip); + + $tagsHiddenInput.val($tagsHiddenInput.val() + tag + ","); + } + }); + $autocompleteContainer.find("[data-js-autocomplete-input]").val(""); + $autocompleteContainer.find("[data-js-autocomplete-suggestions]").html(""); $.onmount(); } @@ -46,70 +55,92 @@ $.onmount('[data-js-autocomplete-input]', function() { // attach an event handler to the form that will add the input's value to // the end of the tags list before submitting (to include any tag that's // still in the input and wasn't converted to a chip) - $(this).closest("form").on("beforeSend.ic", function(evt, elt, data, settings, xhr, requestId) { - $autocompleteInput = $(elt).find("[data-js-autocomplete-input]").first(); - if (!$autocompleteInput.val()) { - return; - } - - var dataPieces = settings.data.split("&"); - for (i = 0; i < dataPieces.length; i++) { - if (dataPieces[i].indexOf("tags=") === 0) { - dataPieces[i] += $autocompleteInput.val(); - break; + $(this) + .closest("form") + /* eslint-disable-next-line no-unused-vars */ + .on("beforeSend.ic", function(evt, elt, data, settings, xhr, requestId) { + var $autocompleteInput = $(elt) + .find("[data-js-autocomplete-input]") + .first(); + if (!$autocompleteInput.val()) { + return; } - } - settings.data = dataPieces.join("&"); - }); + + var dataPieces = settings.data.split("&"); + for (var i = 0; i < dataPieces.length; i++) { + if (dataPieces[i].indexOf("tags=") === 0) { + dataPieces[i] += $autocompleteInput.val(); + break; + } + } + settings.data = dataPieces.join("&"); + }); } - if ($(this).val() !== '') { + if ($(this).val() !== "") { addChip($(this)); } - $(this).focus(function(event) { - var $autocompleteContainer = $(this).parents('[data-js-autocomplete-container]').first(); - var $chips = $autocompleteContainer.find('[data-js-autocomplete-chips]').first(); + $(this).focus(function() { + var $autocompleteContainer = $(this) + .parents("[data-js-autocomplete-container]") + .first(); + var $chips = $autocompleteContainer + .find("[data-js-autocomplete-chips]") + .first(); - $chips.children().removeClass('active'); + $chips.children().removeClass("active"); }); $(this).keydown(function(event) { + var $autocompleteMenu = $("[data-js-autocomplete-menu]").first(); + var $nextActiveItem = null; + switch (event.key) { - case 'Escape': - $('[data-js-autocomplete-menu]').remove(); + case "Escape": + $("[data-js-autocomplete-menu]").remove(); $(this).blur(); break; - case ',': - case 'Enter': + case ",": + case "Enter": event.preventDefault(); addChip($(this)); break; - case 'ArrowDown': + case "ArrowDown": event.preventDefault(); - var $autocompleteMenu = $('[data-js-autocomplete-menu]').first(); - var $nextActiveItem = $autocompleteMenu.children('.menu-item').first(); - $nextActiveItem.children('[data-js-autocomplete-menu-item]').first().focus(); + $nextActiveItem = $autocompleteMenu.children(".menu-item").first(); + $nextActiveItem + .children("[data-js-autocomplete-menu-item]") + .first() + .focus(); break; - case 'ArrowUp': + case "ArrowUp": event.preventDefault(); - var $autocompleteMenu = $('[data-js-autocomplete-menu]').first(); - var $nextActiveItem = $autocompleteMenu.children('.menu-item').last(); - $nextActiveItem.children('[data-js-autocomplete-menu-item]').first().focus(); + $nextActiveItem = $autocompleteMenu.children(".menu-item").last(); + $nextActiveItem + .children("[data-js-autocomplete-menu-item]") + .first() + .focus(); break; - case 'Backspace': - if ($(this).val() === '') { + case "Backspace": + if ($(this).val() === "") { event.preventDefault(); - var $autocompleteContainer = $(this).parents('[data-js-autocomplete-container]').first(); - var $chips = $autocompleteContainer.find('[data-js-autocomplete-chips]').first(); - var $tagsHiddenInput = $("[data-js-autocomplete-hidden-input]"); + var $autocompleteContainer = $(this) + .parents("[data-js-autocomplete-container]") + .first(); + var $chips = $autocompleteContainer + .find("[data-js-autocomplete-chips]") + .first(); var $lastChip = $chips.children().last(); if ($lastChip.length) { $(this).blur(); - if (!$lastChip.hasClass('active')) { + if (!$lastChip.hasClass("active")) { $lastChip.addClass("active"); - $lastChip.children('[data-js-autocomplete-chip-clear]').first().focus(); + $lastChip + .children("[data-js-autocomplete-chip-clear]") + .first() + .focus(); } } } @@ -117,37 +148,44 @@ $.onmount('[data-js-autocomplete-input]', function() { } }); - $(this).keyup(function(event) { + $(this).keyup(function() { var $this = $(this); - var $autocompleteMenu = $('[data-js-autocomplete-menu]'); + var $autocompleteMenu = $("[data-js-autocomplete-menu]"); if ($autocompleteMenu) { $autocompleteMenu.remove(); } - if ($this.val() === '') { + if ($this.val() === "") { return; } - var $tagsHiddenInput = $('[data-js-autocomplete-hidden-input]'); - var suggestions = $this.data('js-autocomplete-input').filter(function(suggestion) { - return suggestion.startsWith($this.val().toLowerCase()) && - !$tagsHiddenInput.val().match(new RegExp('(^|,)' + suggestion + ',')); - }); + var $tagsHiddenInput = $("[data-js-autocomplete-hidden-input]"); + var suggestions = $this + .data("js-autocomplete-input") + .filter(function(suggestion) { + return ( + suggestion.startsWith($this.val().toLowerCase()) && + !$tagsHiddenInput + .val() + .match(new RegExp("(^|,)" + suggestion + ",")) + ); + }); if (suggestions.length === 0) { return; } - var $autocompleteSuggestions = $('[data-js-autocomplete-suggestions]'); + var $autocompleteSuggestions = $("[data-js-autocomplete-suggestions]"); $autocompleteMenu = $('
    '); suggestions.forEach(function(suggestion) { $autocompleteMenu.append( '
  1. ' + '' + - '
    ' + - '
    ' + - suggestion + - '
    ' + - '
    ' + - '    ' + - '
    2. '); + '
    ' + + '
    ' + + suggestion + + "
    " + + "
    " + + "" + + "" + ); }); $autocompleteSuggestions.append($autocompleteMenu); $.onmount(); diff --git a/tildes/static/js/behaviors/autocomplete-menu-item.js b/tildes/static/js/behaviors/autocomplete-menu-item.js index 338fcf7..57a901b 100644 --- a/tildes/static/js/behaviors/autocomplete-menu-item.js +++ b/tildes/static/js/behaviors/autocomplete-menu-item.js @@ -1,37 +1,41 @@ // Copyright (c) 2019 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-autocomplete-menu-item]', function() { +$.onmount("[data-js-autocomplete-menu-item]", function() { function addChip($menuItem) { - var $autocompleteContainer = $menuItem.parents('[data-js-autocomplete-container]').first(); - var $clickedSuggestion = $menuItem.find('.tile > .tile-content').first(); + var $autocompleteContainer = $menuItem + .parents("[data-js-autocomplete-container]") + .first(); + var $clickedSuggestion = $menuItem.find(".tile > .tile-content").first(); var clickedSuggestionText = $clickedSuggestion.html().trim(); - var $tagsHiddenInput = $('[data-js-autocomplete-hidden-input]'); + var $tagsHiddenInput = $("[data-js-autocomplete-hidden-input]"); var $autocompleteInput = $("[data-js-autocomplete-input]"); - if (!$tagsHiddenInput.val().includes(clickedSuggestionText + ',')) { - var $chips = $autocompleteContainer.find('[data-js-autocomplete-chips]').first(); + if (!$tagsHiddenInput.val().includes(clickedSuggestionText + ",")) { + var $chips = $autocompleteContainer + .find("[data-js-autocomplete-chips]") + .first(); - var clearIcon = document.createElement('a'); - clearIcon.classList.add('btn'); - clearIcon.classList.add('btn-clear'); - clearIcon.setAttribute('data-js-autocomplete-chip-clear', ''); - clearIcon.setAttribute('aria-label', 'Close'); - clearIcon.setAttribute('role', 'button'); + var clearIcon = document.createElement("a"); + clearIcon.classList.add("btn"); + clearIcon.classList.add("btn-clear"); + clearIcon.setAttribute("data-js-autocomplete-chip-clear", ""); + clearIcon.setAttribute("aria-label", "Close"); + clearIcon.setAttribute("role", "button"); clearIcon.setAttribute("tabindex", $chips.children().length); - var $chip = $(document.createElement('div')); - $chip.addClass('chip'); + var $chip = $(document.createElement("div")); + $chip.addClass("chip"); $chip.html(clickedSuggestionText); $chip.append(clearIcon); $chips.append($chip); - $tagsHiddenInput.val($tagsHiddenInput.val() + clickedSuggestionText + ','); + $tagsHiddenInput.val($tagsHiddenInput.val() + clickedSuggestionText + ","); } - $autocompleteContainer.find('[data-js-autocomplete-input]').val(''); - $autocompleteContainer.find('[data-js-autocomplete-suggestions]').html(''); + $autocompleteContainer.find("[data-js-autocomplete-input]").val(""); + $autocompleteContainer.find("[data-js-autocomplete-suggestions]").html(""); $autocompleteInput.focus(); $.onmount(); @@ -43,23 +47,36 @@ $.onmount('[data-js-autocomplete-menu-item]', function() { }); $(this).keydown(function(event) { + var $nextActiveItem = null; switch (event.key) { - case 'Escape': - $('[data-js-autocomplete-menu]').parent().remove(); + case "Escape": + $("[data-js-autocomplete-menu]") + .parent() + .remove(); break; - case 'Enter': + case "Enter": event.preventDefault(); addChip($(this)); break; - case 'ArrowDown': + case "ArrowDown": event.preventDefault(); - var $nextActiveItem = $(this).parent().next(); - $nextActiveItem.children('[data-js-autocomplete-menu-item]').first().focus(); + $nextActiveItem = $(this) + .parent() + .next(); + $nextActiveItem + .children("[data-js-autocomplete-menu-item]") + .first() + .focus(); break; - case 'ArrowUp': + case "ArrowUp": event.preventDefault(); - var $nextActiveItem = $(this).parent().prev(); - $nextActiveItem.children('[data-js-autocomplete-menu-item]').first().focus(); + $nextActiveItem = $(this) + .parent() + .prev(); + $nextActiveItem + .children("[data-js-autocomplete-menu-item]") + .first() + .focus(); break; default: break; diff --git a/tildes/static/js/behaviors/autocomplete-menu.js b/tildes/static/js/behaviors/autocomplete-menu.js index ad1391f..d632a96 100644 --- a/tildes/static/js/behaviors/autocomplete-menu.js +++ b/tildes/static/js/behaviors/autocomplete-menu.js @@ -1,11 +1,15 @@ // Copyright (c) 2019 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-autocomplete-menu]', function() { - var $autocompleteContainer = $(this).parents('[data-js-autocomplete-container]').first(); - var $chips = $autocompleteContainer.find('[data-js-autocomplete-chips]').first(); +$.onmount("[data-js-autocomplete-menu]", function() { + var $autocompleteContainer = $(this) + .parents("[data-js-autocomplete-container]") + .first(); + var $chips = $autocompleteContainer.find("[data-js-autocomplete-chips]").first(); - $(this).children('[data-js-autocomplete-menu-item]').each(function(index, $menuItem) { - $menuItem.setAttribute('tabindex', $chips.children().length + index); - }); + $(this) + .children("[data-js-autocomplete-menu-item]") + .each(function(index, $menuItem) { + $menuItem.setAttribute("tabindex", $chips.children().length + index); + }); }); diff --git a/tildes/static/js/behaviors/autoselect-input.js b/tildes/static/js/behaviors/autoselect-input.js index 5a3061f..1f5b764 100644 --- a/tildes/static/js/behaviors/autoselect-input.js +++ b/tildes/static/js/behaviors/autoselect-input.js @@ -1,8 +1,8 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-autoselect-input]', function() { - $(this).click(function(event) { +$.onmount("[data-js-autoselect-input]", function() { + $(this).click(function() { $(this).select(); }); }); diff --git a/tildes/static/js/behaviors/autosubmit-on-change.js b/tildes/static/js/behaviors/autosubmit-on-change.js index bfcdc7c..098f5a5 100644 --- a/tildes/static/js/behaviors/autosubmit-on-change.js +++ b/tildes/static/js/behaviors/autosubmit-on-change.js @@ -1,8 +1,10 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-autosubmit-on-change]', function() { - $(this).change(function(event) { - $(this).closest('form').submit(); +$.onmount("[data-js-autosubmit-on-change]", function() { + $(this).change(function() { + $(this) + .closest("form") + .submit(); }); }); diff --git a/tildes/static/js/behaviors/cancel-button.js b/tildes/static/js/behaviors/cancel-button.js index a063a96..cbc8ff1 100644 --- a/tildes/static/js/behaviors/cancel-button.js +++ b/tildes/static/js/behaviors/cancel-button.js @@ -1,28 +1,31 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-cancel-button]', function() { - $(this).click(function(event) { - var $parentForm = $(this).closest('form'); +$.onmount("[data-js-cancel-button]", function() { + $(this).click(function() { + var $parentForm = $(this).closest("form"); + + var shouldRemove = true; // confirm removal if the form specifies to - var confirmPrompt = $parentForm.attr('data-js-confirm-cancel'); + var confirmPrompt = $parentForm.attr("data-js-confirm-cancel"); if (confirmPrompt) { // only prompt if any of the inputs aren't empty - $nonEmptyFields = $parentForm.find('input,textarea') - .filter(function() { return $(this).val(); }); + var $nonEmptyFields = $parentForm.find("input,textarea").filter(function() { + return $(this).val(); + }); if ($nonEmptyFields.length > 0) { - var shouldRemove = window.confirm(confirmPrompt); + shouldRemove = window.confirm(confirmPrompt); } else { - var shouldRemove = true; + shouldRemove = true; } - } else { - var shouldRemove = true; } if (shouldRemove) { - $(this).closest('form').remove(); + $(this) + .closest("form") + .remove(); } }); }); diff --git a/tildes/static/js/behaviors/comment-collapse-all-button.js b/tildes/static/js/behaviors/comment-collapse-all-button.js index 40ab46f..b0eda1f 100644 --- a/tildes/static/js/behaviors/comment-collapse-all-button.js +++ b/tildes/static/js/behaviors/comment-collapse-all-button.js @@ -1,21 +1,24 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-comment-collapse-all-button]', function() { - $(this).click(function(event) { +$.onmount("[data-js-comment-collapse-all-button]", function() { + $(this).click(function() { // first uncollapse any individually collapsed comments - $('.is-comment-collapsed-individual').each( - function(idx, child) { - $(child).find( - '[data-js-comment-collapse-button]:first').trigger('click'); - }); + $(".is-comment-collapsed-individual").each(function(idx, child) { + $(child) + .find("[data-js-comment-collapse-button]:first") + .trigger("click"); + }); // then collapse all first-level replies - $('.comment[data-comment-depth="1"]:not(.is-comment-collapsed)').each( - function(idx, child) { - $(child).find( - '[data-js-comment-collapse-button]:first').trigger('click'); - }); + $('.comment[data-comment-depth="1"]:not(.is-comment-collapsed)').each(function( + idx, + child + ) { + $(child) + .find("[data-js-comment-collapse-button]:first") + .trigger("click"); + }); $(this).blur(); }); diff --git a/tildes/static/js/behaviors/comment-collapse-button.js b/tildes/static/js/behaviors/comment-collapse-button.js index 390e3a5..7d4b536 100644 --- a/tildes/static/js/behaviors/comment-collapse-button.js +++ b/tildes/static/js/behaviors/comment-collapse-button.js @@ -1,23 +1,23 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-comment-collapse-button]', function() { - $(this).click(function(event) { - $this = $(this); - $comment = $this.closest('.comment'); +$.onmount("[data-js-comment-collapse-button]", function() { + $(this).click(function() { + var $this = $(this); + var $comment = $this.closest(".comment"); // if the comment is individually collapsed, just remove that class, // otherwise toggle the collapsed state - if ($comment.hasClass('is-comment-collapsed-individual')) { - $comment.removeClass('is-comment-collapsed-individual'); + if ($comment.hasClass("is-comment-collapsed-individual")) { + $comment.removeClass("is-comment-collapsed-individual"); } else { - $comment.toggleClass('is-comment-collapsed'); + $comment.toggleClass("is-comment-collapsed"); } - if ($comment.hasClass('is-comment-collapsed')) { - $this.text('+'); + if ($comment.hasClass("is-comment-collapsed")) { + $this.text("+"); } else { - $this.html('−'); + $this.html("−"); } $this.blur(); diff --git a/tildes/static/js/behaviors/comment-expand-all-button.js b/tildes/static/js/behaviors/comment-expand-all-button.js index 510b179..765a81a 100644 --- a/tildes/static/js/behaviors/comment-expand-all-button.js +++ b/tildes/static/js/behaviors/comment-expand-all-button.js @@ -1,13 +1,16 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-comment-expand-all-button]', function() { - $(this).click(function(event) { - $('.is-comment-collapsed, .is-comment-collapsed-individual').each( - function(idx, child) { - $(child).find( - '[data-js-comment-collapse-button]:first').trigger('click'); - }); +$.onmount("[data-js-comment-expand-all-button]", function() { + $(this).click(function() { + $(".is-comment-collapsed, .is-comment-collapsed-individual").each(function( + idx, + child + ) { + $(child) + .find("[data-js-comment-collapse-button]:first") + .trigger("click"); + }); $(this).blur(); }); diff --git a/tildes/static/js/behaviors/comment-label-button.js b/tildes/static/js/behaviors/comment-label-button.js index a0c073c..2aedcb7 100644 --- a/tildes/static/js/behaviors/comment-label-button.js +++ b/tildes/static/js/behaviors/comment-label-button.js @@ -1,28 +1,32 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-comment-label-button]', function() { +$.onmount("[data-js-comment-label-button]", function() { $(this).click(function(event) { event.preventDefault(); - var $comment = $(this).parents('.comment').first(); - var userLabels = $comment.attr('data-comment-user-labels'); + var $comment = $(this) + .parents(".comment") + .first(); + var userLabels = $comment.attr("data-comment-user-labels"); // check if the label button div already exists and just remove it if so - $labelButtons = $comment.find('.comment-itself:first').find('.comment-label-buttons'); + var $labelButtons = $comment + .find(".comment-itself:first") + .find(".comment-label-buttons"); if ($labelButtons.length > 0) { $labelButtons.remove(); return; } - var commentID = $comment.attr('data-comment-id36'); - var labelURL = '/api/web/comments/' + commentID + '/labels/'; + var commentID = $comment.attr("data-comment-id36"); + var labelURL = "/api/web/comments/" + commentID + "/labels/"; - var labeltemplate = document.querySelector('#comment-label-options'); + var labeltemplate = document.querySelector("#comment-label-options"); var clone = document.importNode(labeltemplate.content, true); - var options = clone.querySelectorAll('a'); + var options = clone.querySelectorAll("a"); - for (i = 0; i < options.length; i++) { + for (var i = 0; i < options.length; i++) { var label = options[i]; var labelName = label.getAttribute("data-js-label-name"); @@ -35,34 +39,39 @@ $.onmount('[data-js-comment-label-button]', function() { if (labelOptionActive) { label.className += " btn btn-used"; - label.setAttribute('data-ic-delete-from', labelURL + labelName); + label.setAttribute("data-ic-delete-from", labelURL + labelName); // if the label requires a prompt, confirm that they want to remove it // (since we don't want to accidentally lose the reason they typed in) if (labelPrompt) { - label.setAttribute("data-ic-confirm", "Remove your "+labelName+" label?"); + label.setAttribute( + "data-ic-confirm", + "Remove your " + labelName + " label?" + ); } - $(label).on('after.success.ic', function(evt) { + $(label).on("after.success.ic", function(evt) { var labelName = evt.target.getAttribute("data-js-label-name"); Tildes.removeUserLabel(commentID, labelName); }); } else { - label.setAttribute('data-ic-put-to', labelURL + labelName); + label.setAttribute("data-ic-put-to", labelURL + labelName); if (labelPrompt) { label.setAttribute("data-ic-prompt", labelPrompt); label.setAttribute("data-ic-prompt-name", "reason"); } - $(label).on('after.success.ic', function(evt) { + $(label).on("after.success.ic", function(evt) { var labelName = evt.target.getAttribute("data-js-label-name"); Tildes.addUserLabel(commentID, labelName); // if the applied label was Exemplary, remove the button from the // template since they can't use it again anyway if (labelName === "exemplary") { - var exemplaryButton = labeltemplate.content.querySelector('.btn-comment-label-exemplary'); + var exemplaryButton = labeltemplate.content.querySelector( + ".btn-comment-label-exemplary" + ); if (exemplaryButton) { exemplaryButton.parentElement.remove(); } @@ -70,42 +79,48 @@ $.onmount('[data-js-comment-label-button]', function() { }); } - label.setAttribute('data-ic-target', '#comment-' + commentID + ' .comment-itself:first'); + label.setAttribute( + "data-ic-target", + "#comment-" + commentID + " .comment-itself:first" + ); } // update Intercooler so it knows about these new elements Intercooler.processNodes(clone); - $comment.find(".btn-post").first().after(clone); + $comment + .find(".btn-post") + .first() + .after(clone); }); }); Tildes.removeUserLabel = function(commentID, labelName) { - $comment = $("#comment-" + commentID); - var userLabels = $comment.attr('data-comment-user-labels').split(" "); + var $comment = $("#comment-" + commentID); + var userLabels = $comment.attr("data-comment-user-labels").split(" "); // if the label isn't there, don't need to do anything - labelIndex = userLabels.indexOf(labelName); + var labelIndex = userLabels.indexOf(labelName); if (labelIndex === -1) { return; } // remove the label from the list and update the data attr userLabels.splice(labelIndex, 1); - $comment.attr('data-comment-user-labels', userLabels.join(" ")); -} + $comment.attr("data-comment-user-labels", userLabels.join(" ")); +}; Tildes.addUserLabel = function(commentID, labelName) { - $comment = $("#comment-" + commentID); - var userLabels = $comment.attr('data-comment-user-labels').split(" "); + var $comment = $("#comment-" + commentID); + var userLabels = $comment.attr("data-comment-user-labels").split(" "); // don't add the label again if it's already there - labelIndex = userLabels.indexOf(labelName); + var labelIndex = userLabels.indexOf(labelName); if (labelIndex !== -1) { return; } // add the label to the list and update the data attr userLabels.push(labelName); - $comment.attr('data-comment-user-labels', userLabels.join(" ")); -} + $comment.attr("data-comment-user-labels", userLabels.join(" ")); +}; diff --git a/tildes/static/js/behaviors/comment-parent-button.js b/tildes/static/js/behaviors/comment-parent-button.js index d250837..a787362 100644 --- a/tildes/static/js/behaviors/comment-parent-button.js +++ b/tildes/static/js/behaviors/comment-parent-button.js @@ -1,22 +1,27 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-comment-parent-button]', function() { - $(this).click(function(event) { - var $comment = $(this).parents('.comment').first(); - var $parentComment = $comment.parents('.comment').first(); +$.onmount("[data-js-comment-parent-button]", function() { + $(this).click(function() { + var $comment = $(this) + .parents(".comment") + .first(); + var $parentComment = $comment.parents(".comment").first(); - var backButton = document.createElement('a'); - backButton.setAttribute('href', '#comment-' + $comment.attr('data-comment-id36')); - backButton.setAttribute('class', 'comment-nav-link'); - backButton.setAttribute('data-js-comment-back-button', ''); - backButton.setAttribute('data-js-remove-on-click', ''); - backButton.innerHTML = '[Back]'; + var backButton = document.createElement("a"); + backButton.setAttribute( + "href", + "#comment-" + $comment.attr("data-comment-id36") + ); + backButton.setAttribute("class", "comment-nav-link"); + backButton.setAttribute("data-js-comment-back-button", ""); + backButton.setAttribute("data-js-remove-on-click", ""); + backButton.innerHTML = "[Back]"; - var $parentHeader = $parentComment.find('header').first(); + var $parentHeader = $parentComment.find("header").first(); // remove any existing back button - $parentHeader.find('[data-js-comment-back-button]').remove(); + $parentHeader.find("[data-js-comment-back-button]").remove(); $parentHeader.append(backButton); $.onmount(); diff --git a/tildes/static/js/behaviors/comment-reply-button.js b/tildes/static/js/behaviors/comment-reply-button.js index b15cfca..0f94ad4 100644 --- a/tildes/static/js/behaviors/comment-reply-button.js +++ b/tildes/static/js/behaviors/comment-reply-button.js @@ -1,55 +1,61 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-comment-reply-button]', function() { +$.onmount("[data-js-comment-reply-button]", function() { $(this).click(function(event) { event.preventDefault(); // disable click/hover events on the reply button - $(this).css('pointer-events', 'none'); + $(this).css("pointer-events", "none"); - var $comment = $(this).parents('.comment').first(); + var $comment = $(this) + .parents(".comment") + .first(); // get the replies list, or create one if it doesn't already exist - var $replies = $comment.children('.comment-tree-replies'); + var $replies = $comment.children(".comment-tree-replies"); if (!$replies.length) { - var repliesList = document.createElement('ol'); - repliesList.setAttribute('class', 'comment-tree comment-tree-replies'); + var repliesList = document.createElement("ol"); + repliesList.setAttribute("class", "comment-tree comment-tree-replies"); $comment.append(repliesList); $replies = $(repliesList); } - var $parentComment = $(this).parents('article.comment:first'); - var parentCommentID = $parentComment.attr('data-comment-id36'); - var postURL = '/api/web/comments/' + parentCommentID + '/replies'; - var markdownID = 'markdown-reply-' + parentCommentID; - var previewID = markdownID + '-preview'; + var $parentComment = $(this).parents("article.comment:first"); + var parentCommentID = $parentComment.attr("data-comment-id36"); + var postURL = "/api/web/comments/" + parentCommentID + "/replies"; + var markdownID = "markdown-reply-" + parentCommentID; + var previewID = markdownID + "-preview"; - if ($('#' + markdownID).length > 0) { - $('#' + markdownID).focus(); + if ($("#" + markdownID).length > 0) { + $("#" + markdownID).focus(); return; } // clone and populate the 'comment-reply' template - var template = document.getElementById('comment-reply'); + var template = document.getElementById("comment-reply"); var clone = document.importNode(template.content, true); - clone.querySelector('form').setAttribute('data-ic-post-to', postURL); - var textarea = clone.querySelector('textarea'); - textarea.setAttribute('id', markdownID); + clone.querySelector("form").setAttribute("data-ic-post-to", postURL); + var textarea = clone.querySelector("textarea"); + textarea.setAttribute("id", markdownID); - var preview = clone.querySelector('.form-markdown-preview'); - preview.setAttribute('id', previewID); + var preview = clone.querySelector(".form-markdown-preview"); + preview.setAttribute("id", previewID); - clone.querySelector('[data-js-markdown-preview-tab] .btn') - .setAttribute('data-ic-target', '#' + previewID); + clone + .querySelector("[data-js-markdown-preview-tab] .btn") + .setAttribute("data-ic-target", "#" + previewID); - var cancelButton = clone.querySelector('[data-js-cancel-button]'); - $(cancelButton).on('click', function (event) { + var cancelButton = clone.querySelector("[data-js-cancel-button]"); + $(cancelButton).on("click", function() { // re-enable click/hover events on the reply button - $(this).parents('.comment').first() - .find('.btn-post-action[name=reply]').first() - .css('pointer-events', 'auto'); + $(this) + .parents(".comment") + .first() + .find(".btn-post-action[name=reply]") + .first() + .css("pointer-events", "auto"); }); // If the user has text selected inside a comment when they click the reply @@ -68,7 +74,7 @@ $.onmount('[data-js-comment-reply-button]', function() { if (selectedText.length > 0) { selectedText = selectedText.replace(/\s+$/g, ""); selectedText = selectedText.replace(/^/gm, "> "); - textarea.value = selectedText+"\n\n"; + textarea.value = selectedText + "\n\n"; textarea.scrollTop = textarea.scrollHeight; } } diff --git a/tildes/static/js/behaviors/confirm-leave-page-unsaved.js b/tildes/static/js/behaviors/confirm-leave-page-unsaved.js index fb83003..02be2e7 100644 --- a/tildes/static/js/behaviors/confirm-leave-page-unsaved.js +++ b/tildes/static/js/behaviors/confirm-leave-page-unsaved.js @@ -1,14 +1,14 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-confirm-leave-page-unsaved]', function() { - $form = $(this); +$.onmount("[data-js-confirm-leave-page-unsaved]", function() { + var $form = $(this); $form.areYouSure(); // Fixes a strange interaction between Intercooler and AreYouSure, where // submitting a form by using the keyboard to push the submit button would // trigger a confirmation prompt before leaving the page. - $form.on('success.ic', function() { - $form.removeClass('dirty'); + $form.on("success.ic", function() { + $form.removeClass("dirty"); }); }); diff --git a/tildes/static/js/behaviors/ctrl-enter-submit-form.js b/tildes/static/js/behaviors/ctrl-enter-submit-form.js index 67c4e38..35ba750 100644 --- a/tildes/static/js/behaviors/ctrl-enter-submit-form.js +++ b/tildes/static/js/behaviors/ctrl-enter-submit-form.js @@ -1,11 +1,15 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-ctrl-enter-submit-form]', function() { +$.onmount("[data-js-ctrl-enter-submit-form]", function() { $(this).keydown(function(event) { - if ((event.ctrlKey || event.metaKey) && - (event.keyCode == 13 || event.keyCode == 10)) { - $(this).closest('form').submit(); + if ( + (event.ctrlKey || event.metaKey) && + (event.keyCode == 13 || event.keyCode == 10) + ) { + $(this) + .closest("form") + .submit(); } }); }); diff --git a/tildes/static/js/behaviors/external-links-new-tabs.js b/tildes/static/js/behaviors/external-links-new-tabs.js index 48f03a9..99fd43c 100644 --- a/tildes/static/js/behaviors/external-links-new-tabs.js +++ b/tildes/static/js/behaviors/external-links-new-tabs.js @@ -1,12 +1,14 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-external-links-new-tabs]', function() { +$.onmount("[data-js-external-links-new-tabs]", function() { // Open external links in topic, comment, and message text in new tabs - $(this).find('a').each(function() { - if (this.host !== window.location.host) { - $(this).attr('target', '_blank'); - $(this).attr('rel', 'noopener'); - } - }); + $(this) + .find("a") + .each(function() { + if (this.host !== window.location.host) { + $(this).attr("target", "_blank"); + $(this).attr("rel", "noopener"); + } + }); }); diff --git a/tildes/static/js/behaviors/fadeout-parent-on-success.js b/tildes/static/js/behaviors/fadeout-parent-on-success.js index 464f24a..1273b36 100644 --- a/tildes/static/js/behaviors/fadeout-parent-on-success.js +++ b/tildes/static/js/behaviors/fadeout-parent-on-success.js @@ -1,8 +1,10 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-fadeout-parent-on-success]', function() { - $(this).on('after.success.ic', function() { - $(this).parent().fadeOut('fast'); +$.onmount("[data-js-fadeout-parent-on-success]", function() { + $(this).on("after.success.ic", function() { + $(this) + .parent() + .fadeOut("fast"); }); }); diff --git a/tildes/static/js/behaviors/hide-sidebar-if-open.js b/tildes/static/js/behaviors/hide-sidebar-if-open.js index 12e5806..fdbc7e4 100644 --- a/tildes/static/js/behaviors/hide-sidebar-if-open.js +++ b/tildes/static/js/behaviors/hide-sidebar-if-open.js @@ -1,12 +1,12 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-hide-sidebar-if-open]', function() { - $(this).on('click', function(event) { - if ($('#sidebar').hasClass('is-sidebar-displayed')) { +$.onmount("[data-js-hide-sidebar-if-open]", function() { + $(this).on("click", function(event) { + if ($("#sidebar").hasClass("is-sidebar-displayed")) { event.preventDefault(); event.stopPropagation(); - $('#sidebar').removeClass('is-sidebar-displayed'); + $("#sidebar").removeClass("is-sidebar-displayed"); } }); }); diff --git a/tildes/static/js/behaviors/hide-sidebar-no-preventdefault.js b/tildes/static/js/behaviors/hide-sidebar-no-preventdefault.js index 775051b..b07eb34 100644 --- a/tildes/static/js/behaviors/hide-sidebar-no-preventdefault.js +++ b/tildes/static/js/behaviors/hide-sidebar-no-preventdefault.js @@ -1,8 +1,8 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-hide-sidebar-no-preventdefault]', function() { - $(this).on('click', function(event) { - $('#sidebar').removeClass('is-sidebar-displayed'); +$.onmount("[data-js-hide-sidebar-no-preventdefault]", function() { + $(this).on("click", function() { + $("#sidebar").removeClass("is-sidebar-displayed"); }); }); diff --git a/tildes/static/js/behaviors/markdown-edit-tab.js b/tildes/static/js/behaviors/markdown-edit-tab.js index dcf26b6..5a65680 100644 --- a/tildes/static/js/behaviors/markdown-edit-tab.js +++ b/tildes/static/js/behaviors/markdown-edit-tab.js @@ -1,13 +1,17 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-markdown-edit-tab]', function() { - $(this).click(function(event) { - var $editTextarea = $(this).closest('form').find('[name="markdown"]'); - var $previewDiv = $(this).closest('form').find('.form-markdown-preview'); +$.onmount("[data-js-markdown-edit-tab]", function() { + $(this).click(function() { + var $editTextarea = $(this) + .closest("form") + .find('[name="markdown"]'); + var $previewDiv = $(this) + .closest("form") + .find(".form-markdown-preview"); - $editTextarea.removeClass('d-none'); - $previewDiv.addClass('d-none'); + $editTextarea.removeClass("d-none"); + $previewDiv.addClass("d-none"); $previewDiv.empty(); }); }); diff --git a/tildes/static/js/behaviors/markdown-preview-tab.js b/tildes/static/js/behaviors/markdown-preview-tab.js index f4b4983..723550d 100644 --- a/tildes/static/js/behaviors/markdown-preview-tab.js +++ b/tildes/static/js/behaviors/markdown-preview-tab.js @@ -1,16 +1,20 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-markdown-preview-tab]', function() { - $(this).click(function(event) { - var $editTextarea = $(this).closest('form').find('[name="markdown"]'); - var $previewDiv = $(this).closest('form').find('.form-markdown-preview'); +$.onmount("[data-js-markdown-preview-tab]", function() { + $(this).click(function() { + var $editTextarea = $(this) + .closest("form") + .find('[name="markdown"]'); + var $previewDiv = $(this) + .closest("form") + .find(".form-markdown-preview"); - $editTextarea.addClass('d-none'); - $previewDiv.removeClass('d-none'); + $editTextarea.addClass("d-none"); + $previewDiv.removeClass("d-none"); }); - $(this).on('after.success.ic success.ic', function(event) { + $(this).on("after.success.ic success.ic", function(event) { // Stop intercooler event from bubbling up past this button. This // prevents behaviors on parent elements from mistaking a successful // "preview" from a successful "submit". diff --git a/tildes/static/js/behaviors/prevent-double-submit.js b/tildes/static/js/behaviors/prevent-double-submit.js index 09302d8..732c20f 100644 --- a/tildes/static/js/behaviors/prevent-double-submit.js +++ b/tildes/static/js/behaviors/prevent-double-submit.js @@ -1,19 +1,20 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-prevent-double-submit]', function() { - $(this).on('beforeSend.ic', function(evt, elt, data, settings, xhr, requestId) { +$.onmount("[data-js-prevent-double-submit]", function() { + /* eslint-disable-next-line no-unused-vars */ + $(this).on("beforeSend.ic", function(evt, elt, data, settings, xhr, requestId) { var $form = $(this); - if ($form.attr('data-js-submitting') !== undefined) { + if ($form.attr("data-js-submitting") !== undefined) { xhr.abort(); return false; } else { - $form.attr('data-js-submitting', true); + $form.attr("data-js-submitting", true); } }); - $(this).on('complete.ic', function() { - $(this).removeAttr('data-js-submitting'); + $(this).on("complete.ic", function() { + $(this).removeAttr("data-js-submitting"); }); }); diff --git a/tildes/static/js/behaviors/remove-on-click.js b/tildes/static/js/behaviors/remove-on-click.js index de38b0b..4367f84 100644 --- a/tildes/static/js/behaviors/remove-on-click.js +++ b/tildes/static/js/behaviors/remove-on-click.js @@ -1,8 +1,8 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-remove-on-click]', function() { - $(this).on('click', function() { +$.onmount("[data-js-remove-on-click]", function() { + $(this).on("click", function() { $(this).remove(); }); }); diff --git a/tildes/static/js/behaviors/remove-on-success.js b/tildes/static/js/behaviors/remove-on-success.js index 58ea210..bf1e84c 100644 --- a/tildes/static/js/behaviors/remove-on-success.js +++ b/tildes/static/js/behaviors/remove-on-success.js @@ -1,8 +1,8 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-remove-on-success]', function() { - $(this).on('after.success.ic', function() { +$.onmount("[data-js-remove-on-success]", function() { + $(this).on("after.success.ic", function() { $(this).remove(); }); }); diff --git a/tildes/static/js/behaviors/sidebar-toggle.js b/tildes/static/js/behaviors/sidebar-toggle.js index 570d820..dabfa2a 100644 --- a/tildes/static/js/behaviors/sidebar-toggle.js +++ b/tildes/static/js/behaviors/sidebar-toggle.js @@ -1,11 +1,11 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-sidebar-toggle]', function() { +$.onmount("[data-js-sidebar-toggle]", function() { $(this).click(function(event) { event.preventDefault(); event.stopPropagation(); - $('#sidebar').toggleClass('is-sidebar-displayed'); + $("#sidebar").toggleClass("is-sidebar-displayed"); }); }); diff --git a/tildes/static/js/behaviors/tab.js b/tildes/static/js/behaviors/tab.js index c18105a..45034d6 100644 --- a/tildes/static/js/behaviors/tab.js +++ b/tildes/static/js/behaviors/tab.js @@ -1,9 +1,11 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-tab]', function() { - $(this).click(function(event) { - $(this).siblings().removeClass('active'); - $(this).addClass('active'); +$.onmount("[data-js-tab]", function() { + $(this).click(function() { + $(this) + .siblings() + .removeClass("active"); + $(this).addClass("active"); }); }); diff --git a/tildes/static/js/behaviors/theme-selector.js b/tildes/static/js/behaviors/theme-selector.js index 55aa050..ae8798b 100644 --- a/tildes/static/js/behaviors/theme-selector.js +++ b/tildes/static/js/behaviors/theme-selector.js @@ -1,40 +1,48 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-theme-selector]', function() { +$.onmount("[data-js-theme-selector]", function() { $(this).change(function(event) { event.preventDefault(); // hide any IC change message - $(this).parent().find('.form-status').hide(); + $(this) + .parent() + .find(".form-status") + .hide(); var new_theme = $(this).val(); - var selected_text = $(this).find('option:selected').text(); - var $setDefaultButton = $('#button-set-default-theme'); + var selected_text = $(this) + .find("option:selected") + .text(); + var $setDefaultButton = $("#button-set-default-theme"); // persist the new theme for the user in their cookie - document.cookie = 'theme=' + new_theme + ';' + - 'path=/;max-age=315360000;secure;domain=' + + document.cookie = + "theme=" + + new_theme + + ";" + + "path=/;max-age=315360000;secure;domain=" + document.location.hostname; // remove any theme classes currently on the body - $body = $('body').first(); - var bodyClasses = $body[0].className.split(' '); - for (i = 0; i < bodyClasses.length; i++) { - cls = bodyClasses[i]; - if (cls.indexOf('theme-') === 0) { + var $body = $("body").first(); + var bodyClasses = $body[0].className.split(" "); + for (var i = 0; i < bodyClasses.length; i++) { + var cls = bodyClasses[i]; + if (cls.indexOf("theme-") === 0) { $body.removeClass(cls); } } // add the class for the new theme to the body - $body.addClass('theme-' + new_theme); + $body.addClass("theme-" + new_theme); // set visibility of 'Set as account default' button - if (selected_text.indexOf('account default') === -1) { - $setDefaultButton.removeClass('d-none'); + if (selected_text.indexOf("account default") === -1) { + $setDefaultButton.removeClass("d-none"); } else { - $setDefaultButton.addClass('d-none'); + $setDefaultButton.addClass("d-none"); } }); }); diff --git a/tildes/static/js/behaviors/time-period-select.js b/tildes/static/js/behaviors/time-period-select.js index bcd0284..b04da77 100644 --- a/tildes/static/js/behaviors/time-period-select.js +++ b/tildes/static/js/behaviors/time-period-select.js @@ -1,17 +1,19 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -$.onmount('[data-js-time-period-select]', function() { - $(this).change(function(event) { +$.onmount("[data-js-time-period-select]", function() { + $(this).change(function() { var periodValue = this.value; - if (periodValue === 'other') { - var enteredPeriod = ''; - validRegex = /^\d+[hd]?$/i; + if (periodValue === "other") { + var enteredPeriod = ""; + var validRegex = /^\d+[hd]?$/i; // prompt for a time period until they enter a valid one while (!validRegex.test(enteredPeriod)) { - enteredPeriod = prompt('Enter a custom time period (number of hours, or add a "d" suffix for days):'); + enteredPeriod = prompt( + 'Enter a custom time period (number of hours, or add a "d" suffix for days):' + ); // exit if they specifically cancelled the prompt if (enteredPeriod === null) { @@ -21,7 +23,7 @@ $.onmount('[data-js-time-period-select]', function() { // if it was just a bare number, append "h" if (/^\d+$/.test(enteredPeriod)) { - enteredPeriod += 'h'; + enteredPeriod += "h"; } // need to add the option to the