edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

[ESLint] Fix style complaints

Browse Source
This commit is contained in:
Sindrake 2024-07-17 14:22:24 -07:00
parent 82891b91d1
commit 6cbe400cc5
37 changed files with 1103 additions and 1093 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/settings.json vendored
View File

@ -12,6 +12,7 @@
"editor.detectIndentation": false,
"editor.tabSize": 2,
"editor.insertSpaces": true,
"editor.rulers": [100],
"editor.formatOnSave": false,
// Eslint shenanigans

18
app/javascript/src/javascripts/artist.js
View File

@ -1,28 +1,26 @@
import Utility from './utility';
import { SendQueue } from './send_queue';
import Utility from "./utility";
import { SendQueue } from "./send_queue";
const Artist = {};
Artist.update = function (id, params) {
SendQueue.add(function() {
SendQueue.add(() => {
$.ajax({
type: "PUT",
url: "/artists/" + id + ".json",
data: params,
success: function() {
Utility.notice("Artist updated.");
},
error: function() {
success: () => { Utility.notice("Artist updated."); },
error: () => {
Utility.error(`There was an error updating <a href="/artists/${id}">artist #${id}</a>`);
}
},
});
});
};
function init () {
$("#undelete-artist-link").on('click', e => {
$("#undelete-artist-link").on("click", e => {
if (confirm("Are you sure you want to undelete this artist?"))
Artist.update($(e.target).data('aid'), {"artist[is_active]": true});
Artist.update($(e.target).data("aid"), {"artist[is_active]": true});
e.preventDefault();
});
}

118
app/javascript/src/javascripts/blacklists.js
View File

@ -1,6 +1,6 @@
import Utility from './utility'
import LS from './local_storage'
import Post from './posts';
import Utility from "./utility";
import LS from "./local_storage";
import Post from "./posts";
let Blacklist = {};
@ -38,14 +38,14 @@ Blacklist.lineSet = function (line, enabled) {
Blacklist.entryParse = function (string) {
const fixInsanity = function (input) {
switch (input) {
case '=>':
return '>=';
case '=<':
return '<=';
case '=':
return '==';
case '':
return '==';
case "=>":
return ">=";
case "=<":
return "<=";
case "=":
return "==";
case "":
return "==";
default:
return input;
}
@ -59,13 +59,13 @@ Blacklist.entryParse = function (string) {
"hits": 0,
"score_comparison": null,
"username": false,
"user_id": 0
"user_id": 0,
};
const matches = string.match(/\S+/g) || [];
for (const tag of matches) {
if (tag.charAt(0) === '-') {
if (tag.charAt(0) === "-") {
entry.exclude.push(tag.slice(1));
} else if (tag.charAt(0) === '~') {
} else if (tag.charAt(0) === "~") {
entry.optional.push(tag.slice(1));
} else if (tag.match(/^score:[<=>]{0,2}-?\d+/)) {
const score = tag.match(/^score:([<=>]{0,2})(-?\d+)/);
@ -166,7 +166,7 @@ Blacklist.sidebarUpdate = function () {
$("#blacklist-box").show();
}
};
Blacklist.initialize_disable_all_blacklists = function () {
if (LS.get("dab") === "1") {
@ -184,7 +184,7 @@ Blacklist.initialize_disable_all_blacklists = function () {
Blacklist.entriesAllSet(true);
Blacklist.apply();
});
}
};
Blacklist.apply = function () {
Blacklist.post_count = 0;
@ -220,25 +220,25 @@ Blacklist.apply = function () {
}
Blacklist.sidebarUpdate();
}
};
Blacklist.posts = function () {
return $(".post-preview, #image-container, #c-comments .post, .post-thumbnail");
}
};
Blacklist.postMatch = function (post, entry) {
const $post = $(post);
if ($post.hasClass('post-no-blacklist'))
if ($post.hasClass("post-no-blacklist"))
return false;
let post_data = {
id: $post.data('id'),
score: parseInt($post.data('score'), 10),
tags: $post.data('tags').toString(),
rating: $post.data('rating'),
uploader_id: $post.data('uploader-id'),
user: $post.data('uploader').toString().toLowerCase(),
flags: $post.data('flags'),
is_fav: $post.data('is-favorited')
id: $post.data("id"),
score: parseInt($post.data("score"), 10),
tags: $post.data("tags").toString(),
rating: $post.data("rating"),
uploader_id: $post.data("uploader-id"),
user: $post.data("uploader").toString().toLowerCase(),
flags: $post.data("flags"),
is_fav: $post.data("is-favorited"),
};
return Blacklist.postMatchObject(post_data, entry);
};
@ -246,18 +246,18 @@ Blacklist.postMatch = function (post, entry) {
Blacklist.postMatchObject = function (post, entry) {
const rangeComparator = function (comparison, target) {
// Bad comparison, post matches score.
if (!Array.isArray(comparison) || typeof target === 'undefined' || comparison.length !== 2)
if (!Array.isArray(comparison) || typeof target === "undefined" || comparison.length !== 2)
return true;
switch (comparison[0]) {
case '<':
case "<":
return target < comparison[1];
case '<=':
case "<=":
return target <= comparison[1];
case '==':
case "==":
return target == comparison[1];
case '>=':
case ">=":
return target >= comparison[1];
case '>':
case ">":
return target > comparison[1];
default:
return true;
@ -273,7 +273,7 @@ Blacklist.postMatchObject = function (post, entry) {
tags.push(`height:${post.height}`);
tags.push(`width:${post.width}`);
if (post.is_fav)
tags.push('fav:me');
tags.push("fav:me");
$.each(post.flags.match(/\S+/g) || [], function (i, v) {
tags.push(`status:${v}`);
});
@ -281,7 +281,7 @@ Blacklist.postMatchObject = function (post, entry) {
return (Utility.is_subset(tags, entry.require) && score_test)
&& (!entry.optional.length || Utility.intersect(tags, entry.optional).length)
&& !Utility.intersect(tags, entry.exclude).length;
}
};
Blacklist.initialize_all = function () {
Blacklist.entriesParse();
@ -289,18 +289,18 @@ Blacklist.initialize_all = function () {
Blacklist.initialize_disable_all_blacklists();
Blacklist.apply();
$("#blacklisted-hider").remove();
}
};
Blacklist.initialize_anonymous_blacklist = function () {
if ($(document.body).data('user-is-anonymous') !== true) {
if ($(document.body).data("user-is-anonymous") !== true) {
return;
}
const anonBlacklist = LS.get('anonymous-blacklist');
const anonBlacklist = LS.get("anonymous-blacklist");
if (anonBlacklist) {
$("meta[name=blacklisted-tags]").attr("content", anonBlacklist);
}
}
};
Blacklist.initialize_blacklist_editor = function () {
$("#blacklist-edit-dialog").dialog({
@ -309,21 +309,21 @@ Blacklist.initialize_blacklist_editor = function () {
height: 400,
});
$("#blacklist-cancel").on('click', function () {
$("#blacklist-edit-dialog").dialog('close');
$("#blacklist-cancel").on("click", function () {
$("#blacklist-edit-dialog").dialog("close");
});
$("#blacklist-save").on('click', function () {
$("#blacklist-save").on("click", function () {
const blacklist_content = $("#blacklist-edit").val();
const blacklist_json = JSON.stringify(blacklist_content.split(/\n\r?/));
if($(document.body).data('user-is-anonymous') === true) {
LS.put('anonymous-blacklist', blacklist_json);
if ($(document.body).data("user-is-anonymous") === true) {
LS.put("anonymous-blacklist", blacklist_json);
} else {
$.ajax("/users/" + Utility.meta("current-user-id") + ".json", {
method: "PUT",
data: {
"user[blacklisted_tags]": blacklist_content
}
"user[blacklisted_tags]": blacklist_content,
},
}).done(function () {
Utility.notice("Blacklist updated");
}).fail(function () {
@ -331,42 +331,42 @@ Blacklist.initialize_blacklist_editor = function () {
});
}
$("#blacklist-edit-dialog").dialog('close');
$("#blacklist-edit-dialog").dialog("close");
$("meta[name=blacklisted-tags]").attr("content", blacklist_json);
Blacklist.initialize_all();
});
$("#blacklist-edit-link").on('click', function (event) {
$("#blacklist-edit-link").on("click", function (event) {
event.preventDefault();
let entries = JSON.parse(Utility.meta("blacklisted-tags") || "[]");
entries = entries.map(e => e.replace(/(rating:[qes])\w+/ig, "$1").toLowerCase());
entries = entries.filter(e => e.trim() !== "");
$("#blacklist-edit").val(entries.join('\n'));
$("#blacklist-edit-dialog").dialog('open');
$("#blacklist-edit").val(entries.join("\n"));
$("#blacklist-edit-dialog").dialog("open");
});
};
Blacklist.collapseGet = function () {
const lsValue = LS.get('bc') || '1';
return lsValue === '1';
const lsValue = LS.get("bc") || "1";
return lsValue === "1";
};
Blacklist.collapseSet = function (collapsed) {
LS.put('bc', collapsed ? "1" : "0");
LS.put("bc", collapsed ? "1" : "0");
};
Blacklist.collapseUpdate = function () {
if (Blacklist.collapseGet()) {
$('#blacklist-list').hide();
$('#blacklist-collapse').addClass('hidden');
$("#blacklist-list").hide();
$("#blacklist-collapse").addClass("hidden");
} else {
$('#blacklist-list').show();
$('#blacklist-collapse').removeClass('hidden');
$("#blacklist-list").show();
$("#blacklist-collapse").removeClass("hidden");
}
};
Blacklist.initialize_collapse = function () {
$("#blacklist-collapse").on('click', function (e) {
$("#blacklist-collapse").on("click", function (e) {
e.preventDefault();
const current = Blacklist.collapseGet();
Blacklist.collapseSet(!current);
@ -382,4 +382,4 @@ $(document).ready(function () {
Blacklist.initialize_all();
});
export default Blacklist
export default Blacklist;

13
app/javascript/src/javascripts/blips.js
View File

@ -1,3 +1,4 @@
/* eslint-disable quotes */
import Utility from './utility.js';
let Blip = {};
@ -9,8 +10,8 @@ Blip.atme = function (id) {
dataType: 'json',
accept: 'text/javascript',
data: {
id: id
}
id: id,
},
}).done(function (data) {
$('#blip_body_for_')[0].value += '@' + data.creator_name.replace(/ /g, "_") + ': ';
$("#blip_body_for_")[0].focus();
@ -27,8 +28,8 @@ Blip.quote = function (id) {
dataType: 'json',
accept: 'text/javascript',
data: {
id: id
}
id: id,
},
}).done(function (data) {
const stripped_body = data.body.replace(/\[quote\](?:.|\n|\r)+?\[\/quote\][\n\r]*/gm, "");
$('#blip_body_for_')[0].value += `[quote]"${data.creator_name}":/users/${data.creator_id} said:
@ -54,7 +55,7 @@ Blip.initialize_all = function() {
e.preventDefault();
});
}
}
};
Blip.reinitialize_all = function () {
if ($("#c-blips").length) {
@ -62,7 +63,7 @@ Blip.reinitialize_all = function() {
$(".blip-reply-link").off('click');
Blip.initialize_all();
}
}
};
$(function () {
Blip.initialize_all();

122
app/javascript/src/javascripts/comments.js
View File

@ -7,42 +7,42 @@ Comment.initialize_all = function () {
if ($("#c-posts").length || $("#c-comments").length) {
$(".edit_comment_link").on("click", Comment.show_edit_form);
$(".expand-comment-response").on("click", Comment.show_new_comment_form);
$('.comment-vote-up-link').on("click", Comment.vote_up);
$(".comment-vote-up-link").on("click", Comment.vote_up);
$(".comment-vote-down-link").on("click", Comment.vote_down);
$(".comment-reply-link").on('click', Comment.quote);
$(".comment-hide-link").on('click', Comment.hide);
$(".comment-unhide-link").on('click', Comment.unhide);
$(".comment-delete-link").on('click', Comment.delete);
$(".show-all-comments-for-post-link").on('click', Comment.show_all);
$(".comment-reply-link").on("click", Comment.quote);
$(".comment-hide-link").on("click", Comment.hide);
$(".comment-unhide-link").on("click", Comment.unhide);
$(".comment-delete-link").on("click", Comment.delete);
$(".show-all-comments-for-post-link").on("click", Comment.show_all);
$(".comment-tag-hide-link").on("click", Comment.toggle_post_tags);
}
}
};
Comment.reinitialize_all = function () {
if ($("#c-posts").length || $("#c-comments").length) {
$(".comment-reply-link").off('click');
$(".comment-hide-link").off('click');
$(".comment-unhide-link").off('click');
$(".comment-delete-link").off('click');
$(".show-all-comments-for-post-link").off('click');
$(".comment-reply-link").off("click");
$(".comment-hide-link").off("click");
$(".comment-unhide-link").off("click");
$(".comment-delete-link").off("click");
$(".show-all-comments-for-post-link").off("click");
$(".comment-tag-hide-link").off("click");
$(".edit_comment_link").off('click');
$(".expand-comment-response").off('click');
$('.comment-vote-up-link').off('click');
$(".comment-vote-down-link").off('click');
$(".edit_comment_link").off("click");
$(".expand-comment-response").off("click");
$(".comment-vote-up-link").off("click");
$(".comment-vote-down-link").off("click");
Comment.initialize_all();
DText.initialize_all_inputs();
}
}
};
Comment.show_all = function (e) {
e.preventDefault();
const target = $(e.target);
const post_id = target.data('pid');
const post_id = target.data("pid");
$.ajax({
url: `/posts/${post_id}/comments.json`,
type: 'GET',
dataType: 'json'
type: "GET",
dataType: "json",
}).done(function (data) {
$(`#threshold-comments-notice-for-${post_id}`).hide();
@ -59,15 +59,15 @@ Comment.hide = function (e) {
e.preventDefault();
if (!confirm("Are you sure you want to hide this comment?"))
return;
const parent = $(e.target).parents('article.comment');
const cid = parent.data('comment-id');
const parent = $(e.target).parents("article.comment");
const cid = parent.data("comment-id");
$.ajax({
url: `/comments/${cid}/hide.json`,
type: 'POST',
dataType: 'json'
type: "POST",
dataType: "json",
}).done(function () {
$(`.comment[data-comment-id="${cid}"] div.author h1`).append(" (hidden)");
$(`.comment[data-comment-id="${cid}"]`).attr('data-is-deleted', 'true');
$(`.comment[data-comment-id="${cid}"]`).attr("data-is-deleted", "true");
}).fail(function () {
Utility.error("Failed to hide comment.");
});
@ -77,16 +77,16 @@ Comment.unhide = function (e) {
e.preventDefault();
if (!confirm("Are you sure you want to unhide this comment?"))
return;
const parent = $(e.target).parents('article.comment');
const cid = parent.data('comment-id');
const parent = $(e.target).parents("article.comment");
const cid = parent.data("comment-id");
$.ajax({
url: `/comments/${cid}/unhide.json`,
type: 'POST',
dataType: 'json'
type: "POST",
dataType: "json",
}).done(function () {
const $author = $(`.comment[data-comment-id="${cid}"] div.author h1`);
$author.text($author.text().replace(" (hidden)", ""));
$(`.comment[data-comment-id="${cid}"]`).attr('data-is-deleted', 'false');
$(`.comment[data-comment-id="${cid}"]`).attr("data-is-deleted", "false");
}).fail(function () {
Utility.error("Failed to unhide comment.");
});
@ -96,12 +96,12 @@ Comment.delete = function (e) {
e.preventDefault();
if (!confirm("Are you sure you want to permanently delete this comment?"))
return;
const parent = $(e.target).parents('article.comment');
const cid = parent.data('comment-id');
const parent = $(e.target).parents("article.comment");
const cid = parent.data("comment-id");
$.ajax({
url: `/comments/${cid}.json`,
type: 'DELETE',
dataType: 'json'
type: "DELETE",
dataType: "json",
}).done(function () {
parent.remove();
}).fail(function () {
@ -111,17 +111,17 @@ Comment.delete = function (e) {
Comment.quote = function (e) {
e.preventDefault();
const parent = $(e.target).parents('article.comment');
const pid = parent.data('post-id');
const cid = parent.data('comment-id');
const parent = $(e.target).parents("article.comment");
const pid = parent.data("post-id");
const cid = parent.data("comment-id");
$.ajax({
url: `/comments/${cid}.json`,
type: 'GET',
dataType: 'json',
accept: 'text/javascript'
type: "GET",
dataType: "json",
accept: "text/javascript",
}).done(function (data) {
let stripped_body = data.body.replace(/\[quote\](?:.|\n|\r)+?\[\/quote\][\n\r]*/gm, "");
stripped_body = `[quote]"${parent.data('creator')}":/users/${parent.data('creator-id')} said:
stripped_body = `[quote]"${parent.data("creator")}":/users/${parent.data("creator-id")} said:
${stripped_body}
[/quote]
@ -145,8 +145,8 @@ ${stripped_body}
Comment.toggle_post_tags = function (e) {
e.preventDefault();
const link = $(e.target);
$(`#post-tags-${link.data('post-id')}`).toggleClass("hidden");
}
$(`#post-tags-${link.data("post-id")}`).toggleClass("hidden");
};
Comment.show_new_comment_form = function (e) {
e.preventDefault();
@ -154,55 +154,55 @@ Comment.show_new_comment_form = function (e) {
var $form = $(e.target).closest("div.new-comment").find("form");
$form.show();
$form[0].scrollIntoView(false);
}
};
Comment.show_edit_form = function (e) {
e.preventDefault();
$(this).closest(".comment").find(".edit_comment").show();
}
};
Comment.vote_up = function (e) {
var id = $(e.target).attr('data-id');
var id = $(e.target).attr("data-id");
Comment.vote(id, 1);
}
};
Comment.vote_down = function (e) {
var id = $(e.target).attr('data-id');
var id = $(e.target).attr("data-id");
Comment.vote(id, -1);
}
};
Comment.vote = function (id, score) {
$.ajax({
method: 'POST',
method: "POST",
url: `/comments/${id}/votes.json`,
data: {
score: score
score: score,
},
dataType: 'json'
dataType: "json",
}).done(function (data) {
const scoreClasses = 'score-neutral score-positive score-negative';
const scoreClasses = "score-neutral score-positive score-negative";
const commentID = id;
const commentScore = data.score;
const ourScore = data.our_score;
function scoreToClass (inScore) {
if (inScore === 0) return 'score-neutral';
return inScore > 0 ? 'score-positive' : 'score-negative';
if (inScore === 0) return "score-neutral";
return inScore > 0 ? "score-positive" : "score-negative";
}
$("#comment-score-" + commentID).removeClass(scoreClasses);
$("#comment-vote-up-" + commentID).removeClass(scoreClasses);
$("#comment-vote-down-" + commentID).removeClass(scoreClasses);
$('#comment-score-'+commentID).text(commentScore);
$("#comment-score-" + commentID).text(commentScore);
$("#comment-score-" + commentID).addClass(scoreToClass(commentScore));
$('#comment-vote-up-'+commentID).addClass(ourScore > 0 ? 'score-positive' : 'score-neutral');
$('#comment-vote-down-'+commentID).addClass(ourScore < 0 ? 'score-negative' : 'score-neutral');
Utility.notice('Vote saved');
$("#comment-vote-up-" + commentID).addClass(ourScore > 0 ? "score-positive" : "score-neutral");
$("#comment-vote-down-" + commentID).addClass(ourScore < 0 ? "score-negative" : "score-neutral");
Utility.notice("Vote saved");
}).fail(function (data) {
Utility.error(data.responseJSON.message);
});
}
};
$(document).ready(function () {
Comment.initialize_all();
});
export default Comment
export default Comment;

28
app/javascript/src/javascripts/common.js
View File

@ -1,21 +1,21 @@
import Cookie from './cookie'
import LS from './local_storage'
import Utility from './utility'
import Cookie from "./cookie";
import LS from "./local_storage";
import Utility from "./utility";
function initSearch () {
const $searchForm = $("#searchform");
const $searchShow = $("#search-form-show-link");
const $searchHide = $("#search-form-hide-link");
if ($searchForm.length) {
$searchShow.on('click', e => {
$searchShow.on("click", e => {
e.preventDefault();
$searchForm.fadeIn('fast');
$searchForm.fadeIn("fast");
$searchShow.hide();
$searchHide.show();
});
$searchHide.on('click', e => {
$searchHide.on("click", e => {
e.preventDefault();
$searchForm.fadeOut('fast');
$searchForm.fadeOut("fast");
$searchShow.show();
$searchHide.hide();
});
@ -45,26 +45,26 @@ $(function() {
});
$("#close-notice-link").on("click.danbooru", function (e) {
$('#notice').fadeOut("fast");
$("#notice").fadeOut("fast");
e.preventDefault();
});
$(".revert-item-link").on('click', e => {
$(".revert-item-link").on("click", e => {
e.preventDefault();
const target = $(e.target);
const noun = target.data('noun');
const noun = target.data("noun");
if (!confirm(`Are you sure you want to revert ${noun} to this version?`))
return;
const path = target.attr('href');
const path = target.attr("href");
$.ajax({
method: "PUT",
url: path,
dataType: 'json'
dataType: "json",
}).done(() => {
location.reload();
}).fail(() => {
Utility.error("Failed to revert to specified version.");
})
});
});
initSearch();
@ -72,4 +72,4 @@ $(function() {
window.submitInvisibleRecaptchaForm = function () {
document.getElementById("signup-form").submit();
}
};

14
app/javascript/src/javascripts/cookie.js
View File

@ -19,10 +19,10 @@ Cookie.put = function(name, value, days) {
document.cookie = new_val;
return true;
} else {
Utility.error("You have too many cookies on this site. Consider deleting them all.")
Utility.error("You have too many cookies on this site. Consider deleting them all.");
return false;
}
}
};
Cookie.raw_get = function (name) {
var nameEq = name + "=";
@ -41,18 +41,18 @@ Cookie.raw_get = function(name) {
}
return "";
}
};
Cookie.get = function (name) {
return this.unescape(this.raw_get(name));
}
};
Cookie.remove = function (name) {
this.put(name, "", -1);
}
};
Cookie.unescape = function (val) {
return decodeURIComponent(val.replace(/\+/g, " "));
}
};
export default Cookie
export default Cookie;

12
app/javascript/src/javascripts/dtext.js
View File

@ -1,4 +1,4 @@
import { SendQueue } from './send_queue';
import { SendQueue } from "./send_queue";
const DText = {};
@ -30,7 +30,7 @@ DText.initialze_input = function($element) {
DText.initialize_formatting_buttons($element);
$element.attr("data-initialized", "true");
}
};
DText.initialize_formatting_buttons = function (element) {
const $textarea = $(".dtext-formatter-input", element);
@ -44,7 +44,7 @@ DText.initialize_formatting_buttons = function(element) {
DText.process_formatting(content, $textarea);
});
}
}
};
/** Refreshes the preview field to match the provided input */
function update_preview (input, preview) {
@ -87,7 +87,7 @@ function update_preview(input, preview) {
.attr("loading", "false")
.text("Unable to fetch DText preview.");
input.removeData("cache");
}
},
});
});
}
@ -120,14 +120,14 @@ DText.process_formatting = function (content, input) {
input.prop("selectionStart", position.start + offset.start);
input.prop("selectionEnd", position.start + content.length - offset.end);
input.trigger("focus");
}
};
/** Add formatters to all appropriate inputs */
DText.initialize_all_inputs = function () {
$(".dtext-formatter[data-initialized='false']").each((index, element) => {
DText.initialze_input($(element));
});
}
};
$(function () {
DText.initialize_all_inputs();

14
app/javascript/src/javascripts/favorites.js
View File

@ -1,6 +1,6 @@
import Post from './posts'
import Utility from './utility'
import {SendQueue} from './send_queue'
import Post from "./posts";
import Utility from "./utility";
import {SendQueue} from "./send_queue";
let Favorite = {};
@ -35,9 +35,9 @@ Favorite.create = function (post_id) {
type: "POST",
url: "/favorites.json",
data: {
post_id: post_id
post_id: post_id,
},
dataType: 'json'
dataType: "json",
}).done(function () {
Post.notice_update("dec");
Favorite.after_action(post_id, 1);
@ -55,7 +55,7 @@ Favorite.destroy = function (post_id) {
$.ajax({
type: "DELETE",
url: "/favorites/" + post_id + ".json",
dataType: 'json'
dataType: "json",
}).done(function () {
Post.notice_update("dec");
Favorite.after_action(post_id, -1);
@ -68,4 +68,4 @@ Favorite.destroy = function (post_id) {
$(Favorite.initialize_actions);
export default Favorite
export default Favorite;

90
app/javascript/src/javascripts/forum_posts.js
View File

@ -18,30 +18,30 @@ ForumPost.initialize_all = function() {
e.preventDefault();
});
$(".forum-post-reply-link").on('click', ForumPost.quote);
$(".forum-post-hide-link").on('click', ForumPost.hide);
$(".forum-post-unhide-link").on('click', ForumPost.unhide);
$(".forum-vote-up").on('click', evt => ForumPost.vote(evt, 1));
$(".forum-vote-meh").on('click', evt => ForumPost.vote(evt, 0));
$(".forum-vote-down").on('click', evt => ForumPost.vote(evt, -1));
$(document).on('click', ".forum-vote-remove", ForumPost.vote_remove);
}
$(".forum-post-reply-link").on("click", ForumPost.quote);
$(".forum-post-hide-link").on("click", ForumPost.hide);
$(".forum-post-unhide-link").on("click", ForumPost.unhide);
$(".forum-vote-up").on("click", evt => ForumPost.vote(evt, 1));
$(".forum-vote-meh").on("click", evt => ForumPost.vote(evt, 0));
$(".forum-vote-down").on("click", evt => ForumPost.vote(evt, -1));
$(document).on("click", ".forum-vote-remove", ForumPost.vote_remove);
}
};
ForumPost.reinitialize_all = function () {
if ($("#c-forum-topics #a-show,#c-forum-posts #a-show").length) {
$(".edit_forum_post_link").off("click.danbooru");
$(".edit_forum_topic_link").off("click.danbooru");
$(".forum-post-reply-link").off('click');
$(".forum-post-hide-link").off('click');
$(".forum-post-unhide-link").off('click');
$(".forum-vote-up").off('click');
$(".forum-vote-meh").off('click');
$(".forum-vote-down").off('click');
$(document).off('click', ".forum-vote-remove");
$(".forum-post-reply-link").off("click");
$(".forum-post-hide-link").off("click");
$(".forum-post-unhide-link").off("click");
$(".forum-vote-up").off("click");
$(".forum-vote-meh").off("click");
$(".forum-vote-down").off("click");
$(document).off("click", ".forum-vote-remove");
this.initialize_all();
}
}
};
ForumPost.vote = function (evt, score) {
evt.preventDefault();
@ -50,11 +50,11 @@ ForumPost.vote = function(evt, score) {
"1": { fa_class: "fa-thumbs-up", e6_class: "up" },
"0": { fa_class: "fa-face-meh", e6_class: "meh" },
"-1": { fa_class: "fa-thumbs-down", e6_class: "down" },
}
const icon = $('<a>').attr('href', '#').attr('data-forum-id', new_vote.forum_post_id).addClass('forum-vote-remove').append($('<i>').addClass('fa-regular').addClass(score_map[new_vote.score.toString()].fa_class));
const username = $('<a>').attr('href', `/users/${new_vote.creator_id}`).text(new_vote.creator_name);
const container = $('<li>').addClass(`vote-score-${score_map[new_vote.score].e6_class}`).addClass('own-forum-vote');
container.append(icon).append(' ').append(username);
};
const icon = $("<a>").attr("href", "#").attr("data-forum-id", new_vote.forum_post_id).addClass("forum-vote-remove").append($("<i>").addClass("fa-regular").addClass(score_map[new_vote.score.toString()].fa_class));
const username = $("<a>").attr("href", `/users/${new_vote.creator_id}`).text(new_vote.creator_name);
const container = $("<li>").addClass(`vote-score-${score_map[new_vote.score].e6_class}`).addClass("own-forum-vote");
container.append(icon).append(" ").append(username);
$(`#forum-post-votes-for-${new_vote.forum_post_id}`).prepend(container);
};
const id = $(evt.currentTarget).data("forum-id");
@ -63,7 +63,7 @@ ForumPost.vote = function(evt, score) {
type: "POST",
dataType: "json",
accept: "text/javascript",
data: { "forum_post_vote[score]": score }
data: { "forum_post_vote[score]": score },
}).done(function (data) {
create_post(data);
$(`#forum-post-votes-for-${id} .forum-post-vote-block`).hide();
@ -74,7 +74,7 @@ ForumPost.vote = function(evt, score) {
Utility.error("Failed to vote on forum post.");
}
});
}
};
ForumPost.vote_remove = function (evt) {
evt.preventDefault();
@ -90,26 +90,26 @@ ForumPost.vote_remove = function(evt) {
Utility.notice("Vote removed.");
}).fail(function () {
Utility.error("Failed to unvote on forum post.");
})
}
});
};
ForumPost.quote = function (e) {
e.preventDefault();
const parent = $(e.target).parents('article.forum-post');
const fpid = parent.data('forum-post-id');
const parent = $(e.target).parents("article.forum-post");
const fpid = parent.data("forum-post-id");
$.ajax({
url: `/forum_posts/${fpid}.json`,
type: 'GET',
dataType: 'json',
accept: 'text/javascript'
type: "GET",
dataType: "json",
accept: "text/javascript",
}).done(function (data) {
let stripped_body = data.body.replace(/\[quote\](?:.|\n|\r)+?\[\/quote\][\n\r]*/gm, "");
stripped_body = `[quote]"${parent.data('creator')}":/users/${parent.data('creator-id')} said:
stripped_body = `[quote]"${parent.data("creator")}":/users/${parent.data("creator-id")} said:
${stripped_body}
[/quote]
`;
var $textarea = $('#forum_post_body_for_');
var $textarea = $("#forum_post_body_for_");
var msg = stripped_body;
if ($textarea.val().length > 0) {
msg = $textarea.val() + "\n\n" + msg;
@ -117,9 +117,9 @@ ${stripped_body}
$textarea.val(msg);
$textarea.selectEnd();
$('#topic-response').show();
$("#topic-response").show();
setTimeout(function () {
$('#topic-response')[0].scrollIntoView();
$("#topic-response")[0].scrollIntoView();
}, 15);
}).fail(function (data) {
Utility.error(data.responseText);
@ -130,15 +130,15 @@ ForumPost.hide = function (e) {
e.preventDefault();
if (!confirm("Are you sure you want to hide this post?"))
return;
const parent = $(e.target).parents('article.forum-post');
const fpid = parent.data('forum-post-id');
const parent = $(e.target).parents("article.forum-post");
const fpid = parent.data("forum-post-id");
$.ajax({
url: `/forum_posts/${fpid}/hide.json`,
type: 'POST',
dataType: 'json'
type: "POST",
dataType: "json",
}).done(function () {
$(`.forum-post[data-forum-post-id="${fpid}"] div.author h4`).append(" (hidden)");
$(`.forum-post[data-forum-post-id="${fpid}"]`).attr('data-is-hidden', 'true');
$(`.forum-post[data-forum-post-id="${fpid}"]`).attr("data-is-hidden", "true");
}).fail(function () {
Utility.error("Failed to hide post.");
});
@ -148,16 +148,16 @@ ForumPost.unhide = function (e) {
e.preventDefault();
if (!confirm("Are you sure you want to unhide this post?"))
return;
const parent = $(e.target).parents('article.forum-post');
const fpid = parent.data('forum-post-id');
const parent = $(e.target).parents("article.forum-post");
const fpid = parent.data("forum-post-id");
$.ajax({
url: `/forum_posts/${fpid}/unhide.json`,
type: 'POST',
dataType: 'json'
type: "POST",
dataType: "json",
}).done(function () {
const $author = $(`.forum-post[data-forum-post-id="${fpid}"] div.author h4`);
$author.text($author.text().replace(" (hidden)", ""));
$(`.forum-post[data-forum-post-id="${fpid}"]`).attr('data-is-hidden', 'false');
$(`.forum-post[data-forum-post-id="${fpid}"]`).attr("data-is-hidden", "false");
}).fail(function () {
Utility.error("Failed to unhide post.");
});
@ -167,4 +167,4 @@ $(document).ready(function() {
ForumPost.initialize_all();
});
export default ForumPost
export default ForumPost;

6
app/javascript/src/javascripts/guest_warning.js
View File

@ -8,15 +8,15 @@ const GuestWarning = {
return;
}
hider.show();
$("#guest-warning-accept").on('click', function() {
$("#guest-warning-accept").on("click", function () {
Cookie.put("gw", "seen");
hider.hide();
});
$("#guest-warning-decline").on('click', function() {
$("#guest-warning-decline").on("click", function () {
Cookie.put("gw", "reject");
window.location.assign("https://www.google.com/");
});
}
},
};
$(document).ready(function () {

2
app/javascript/src/javascripts/local_storage.js
View File

@ -16,7 +16,7 @@ let LS = {
console.log(error);
return null;
}
}
},
};
export default LS;

18
app/javascript/src/javascripts/mascots.js
View File

@ -1,14 +1,14 @@
import LS from './local_storage'
import LS from "./local_storage";
const Mascots = {
current: 0
current: 0,
};
function showMascot (mascot) {
$('body').css("background-image", "url(" + mascot.background_url + ")");
$('body').css("background-color", mascot.background_color);
$('.mascotbox').css("background-image", "url(" + mascot.background_url + ")");
$('.mascotbox').css("background-color", mascot.background_color);
$("body").css("background-image", "url(" + mascot.background_url + ")");
$("body").css("background-color", mascot.background_color);
$(".mascotbox").css("background-image", "url(" + mascot.background_url + ")");
$(".mascotbox").css("background-color", mascot.background_color);
const artistLink = $("<span>").text("Mascot by ").append($("<a>").text(mascot.artist_name).attr("href", mascot.artist_url));
$("#mascot_artist").empty().append(artistLink);
@ -23,11 +23,11 @@ function changeMascot() {
Mascots.current = availableMascotIds[(currentMascotIndex + 1) % availableMascotIds.length];
showMascot(mascots[Mascots.current]);
LS.put('mascot', Mascots.current);
LS.put("mascot", Mascots.current);
}
function initMascots () {
$('#change-mascot').on('click', changeMascot);
$("#change-mascot").on("click", changeMascot);
const mascots = window.mascots;
Mascots.current = LS.get("mascot");
if (!mascots[Mascots.current]) {
@ -39,6 +39,6 @@ function initMascots() {
}
$(function () {
if ($('#c-static > #a-home').length)
if ($("#c-static > #a-home").length)
initMascots();
});

20
app/javascript/src/javascripts/mod_queue.js
View File

@ -1,6 +1,6 @@
import Utility from './utility'
import Post from './posts'
import LS from './local_storage';
import Utility from "./utility";
import Post from "./posts";
import LS from "./local_storage";
let ModQueue = {};
@ -12,13 +12,13 @@ ModQueue.detailed_rejection_dialog = function() {
$("#new_post_disapproval")
.off("submit.danbooru")
.on("submit.danbooru", () => {
Post.disapprove(postID, $("#post_disapproval_reason").val(), $("#post_disapproval_message").val())
Post.disapprove(postID, $("#post_disapproval_reason").val(), $("#post_disapproval_message").val());
return false;
});
Utility.dialog("Detailed Rejection", "#detailed-rejection-dialog");
return false;
}
};
$(function () {
// Toolbar visibility
@ -41,15 +41,15 @@ $(function() {
// Toolbar buttons
$(document).on("click.danbooru", ".quick-mod .detailed-rejection-link", ModQueue.detailed_rejection_dialog);
$(".delete-with-reason-link").on('click', function(e) {
$(".delete-with-reason-link").on("click", function (e) {
e.preventDefault();
const post_id = $(e.target).attr('data-post-id');
const prompt = $(e.target).data('prompt');
const reason = $(e.target).data('reason');
const post_id = $(e.target).attr("data-post-id");
const prompt = $(e.target).data("prompt");
const reason = $(e.target).data("reason");
if (confirm(`Delete post for ${prompt}?`))
Post.delete_with_reason(post_id, reason, true);
});
});
export default ModQueue
export default ModQueue;

14
app/javascript/src/javascripts/news_updates.js
View File

@ -1,4 +1,4 @@
import LS from './local_storage'
import LS from "./local_storage";
let NewsUpdate = {};
@ -8,12 +8,12 @@ NewsUpdate.initialize = function () {
}
const key = parseInt($("#news").data("id"), 10);
$('#news').on('click', function () {
$('#news').toggleClass('open');
$("#news").on("click", function () {
$("#news").toggleClass("open");
});
$('#news-closebutton').on('click', function () {
$('#news').hide();
LS.put('hide_news_notice', key.toString());
$("#news-closebutton").on("click", function () {
$("#news").hide();
LS.put("hide_news_notice", key.toString());
});
if (parseInt(LS.get("hide_news_notice") || 0, 10) < key) {
$("#news").show();
@ -24,4 +24,4 @@ $(function () {
NewsUpdate.initialize();
});
export default NewsUpdate
export default NewsUpdate;

112
app/javascript/src/javascripts/notes.js
View File

@ -1,15 +1,15 @@
import Utility from './utility'
import Utility from "./utility";
let Note = {
Box: {
create: function (id) {
var $inner_border = $('<div/>');
var $inner_border = $("<div/>");
$inner_border.addClass("note-box-inner-border");
$inner_border.css({
opacity: 0.5,
});
var $note_box = $('<div/>');
var $note_box = $("<div/>");
$note_box.addClass("note-box");
$note_box.data("id", String(id));
@ -18,14 +18,14 @@ let Note = {
containment: $("#image"),
stop: function () {
Note.Box.update_data_attributes($note_box);
}
},
});
$note_box.resizable({
containment: $("#image"),
handles: "se, nw",
stop: function () {
Note.Box.update_data_attributes($note_box);
}
},
});
$note_box.css({position: "absolute"});
$note_box.append($inner_border);
@ -36,7 +36,7 @@ let Note = {
update_data_attributes: function ($note_box) {
var $image = $("#image");
var $image_container = $("#image-container")
var $image_container = $("#image-container");
var ratio = $image.width() / parseFloat($image_container.data("width"));
var new_x = parseFloat($note_box.css("left"));
var new_y = parseFloat($note_box.css("top"));
@ -62,7 +62,7 @@ let Note = {
Note.clear_timeouts();
Note.Body.hide_all();
e.stopPropagation();
}
},
);
$note_box.on("resize.danbooru",
@ -70,7 +70,7 @@ let Note = {
var $note_box_inner = $(e.currentTarget);
Note.Box.resize_inner_border($note_box_inner);
e.stopPropagation();
}
},
);
$note_box.on(
@ -78,7 +78,7 @@ let Note = {
function (e) {
Note.dragging = false;
e.stopPropagation();
}
},
);
$note_box.on(
@ -106,7 +106,7 @@ let Note = {
}
e.stopPropagation();
}
},
);
},
@ -127,7 +127,7 @@ let Note = {
var $inner_border = $note_box.find("div.note-box-inner-border");
$inner_border.css({
height: $note_box.height() - 2,
width: $note_box.width() - 2
width: $note_box.width() - 2,
});
if ($inner_border.width() >= $note_box.width() - 2) {
@ -141,14 +141,14 @@ let Note = {
scale: function ($note_box) {
var $image = $("#image");
var $image_container = $("#image-container")
var $image_container = $("#image-container");
var ratio = $image.width() / parseFloat($image_container.data("width"));
var MIN_SIZE = 5;
$note_box.css({
top: Math.ceil(parseFloat($note_box.data("y")) * ratio),
left: Math.ceil(parseFloat($note_box.data("x")) * ratio),
width: Math.max(MIN_SIZE, Math.ceil(parseFloat($note_box.data("width")) * ratio)),
height: Math.max(MIN_SIZE, Math.ceil(parseFloat($note_box.data("height")) * ratio))
height: Math.max(MIN_SIZE, Math.ceil(parseFloat($note_box.data("height")) * ratio)),
});
Note.Box.resize_inner_border($note_box);
},
@ -168,19 +168,19 @@ let Note = {
toggle_all: function () {
var $note_container = $("#note-container");
var is_hidden = ($note_container.css('visibility') === 'hidden');
var is_hidden = ($note_container.css("visibility") === "hidden");
if (is_hidden) {
$note_container.css('visibility', 'visible');
$note_container.css("visibility", "visible");
} else {
$note_container.css('visibility', 'hidden');
}
$note_container.css("visibility", "hidden");
}
},
},
Body: {
create: function (id) {
var $note_body = $('<div></div>');
var $note_body = $("<div></div>");
$note_body.addClass("note-body");
$note_body.data("id", String(id));
$note_body.attr("data-id", String(id));
@ -193,7 +193,7 @@ let Note = {
var $note_box = Note.Box.find($note_body.data("id"));
$note_body.css({
top: $note_box.position().top + $note_box.height() + 5,
left: $note_box.position().left
left: $note_box.position().left,
});
Note.Body.bound_position($note_body);
},
@ -204,7 +204,7 @@ let Note = {
if ($note_body.offset().left + $note_body.width() > doc_width) {
$note_body.css({
left: $note_body.position().left - 10 - ($note_body.offset().left + $note_body.width() - doc_width)
left: $note_body.position().left - 10 - ($note_body.offset().left + $note_body.width() - doc_width),
});
}
},
@ -213,9 +213,9 @@ let Note = {
Note.Body.hide_all();
Note.clear_timeouts();
var $note_body = Note.Body.find(id);
if (!$note_body.data('resized')) {
if (!$note_body.data("resized")) {
Note.Body.resize($note_body);
$note_body.data('resized', 'true');
$note_body.data("resized", "true");
}
$note_body.show();
Note.Body.initialize($note_body);
@ -227,7 +227,9 @@ let Note = {
hide: function (id) {
var $note_body = Note.Body.find(id);
Note.timeouts.push(setTimeout(function() {$note_body.hide();}, 350));
Note.timeouts.push(
setTimeout(() => { $note_body.hide(); }, 350),
);
},
hide_all: function () {
@ -269,7 +271,7 @@ let Note = {
x = (lo + hi) / 2;
$note_body.css("min-width", x);
if ($note_body.height() > h) {
lo = x
lo = x;
} else {
hi = x;
}
@ -319,7 +321,7 @@ let Note = {
e.stopPropagation();
});
}
}
},
},
Edit: {
@ -333,7 +335,7 @@ let Note = {
$(".note-box").resizable("disable");
$(".note-box").draggable("disable");
let $textarea = $('<textarea></textarea>');
let $textarea = $("<textarea></textarea>");
$textarea.css({
width: "97%",
height: "92%",
@ -344,7 +346,7 @@ let Note = {
$textarea.val($note_body.data("original-body"));
}
let $dialog = $('<div></div>');
let $dialog = $("<div></div>");
$dialog.append($textarea);
$dialog.data("id", id);
$dialog.dialog({
@ -353,7 +355,7 @@ let Note = {
position: {
my: "right",
at: "right-20",
of: window
of: window,
},
classes: {
"ui-dialog": "note-edit-dialog",
@ -364,13 +366,13 @@ let Note = {
"Preview": Note.Edit.preview,
"Cancel": Note.Edit.cancel,
"Delete": Note.Edit.destroy,
"History": Note.Edit.history
}
"History": Note.Edit.history,
},
});
$dialog.data("uiDialog")._title = function (title) {
title.html(this.options.title); // Allow unescaped html in dialog title
}
$dialog.dialog("option", "title", 'Edit note #' + id + ' (<a href="/wiki_pages/e621:notes">view help</a>)');
};
$dialog.dialog("option", "title", "Edit note #" + id + " (<a href=\"/wiki_pages/e621:notes\">view help</a>)");
$dialog.on("dialogclose.danbooru", function () {
Note.editing = false;
@ -395,8 +397,8 @@ let Note = {
width: $note_box.width() / ratio,
height: $note_box.height() / ratio,
body: $note_body.data("original-body"),
}
}
},
};
if ($note_box.data("id").match(/x/)) {
hash.note.html_id = $note_box.data("id");
@ -447,14 +449,14 @@ let Note = {
type: "PUT",
data: Note.Edit.parameterize_note($note_box, $note_body),
error: Note.Edit.error_handler,
success: Note.Edit.success_handler
success: Note.Edit.success_handler,
});
} else {
$.ajax("/notes.json", {
type: "POST",
data: Note.Edit.parameterize_note($note_box, $note_body),
error: Note.Edit.error_handler,
success: Note.Edit.success_handler
success: Note.Edit.success_handler,
});
}
},
@ -481,7 +483,7 @@ let Note = {
destroy: function () {
if (!confirm("Do you really want to delete this note?")) {
return
return;
}
var $this = $(this);
@ -494,7 +496,7 @@ let Note = {
Note.Box.find(id).remove();
Note.Body.find(id).remove();
$this.dialog("close");
}
},
});
}
},
@ -506,7 +508,7 @@ let Note = {
window.location.href = "/note_versions?search[note_id]=" + id;
}
$(this).dialog("close");
}
},
},
TranslationMode: {
@ -541,7 +543,7 @@ let Note = {
$(document).on("mouseup.danbooru.note", Note.TranslationMode.Drag.stop);
$("#mark-as-translated-section").show();
Utility.notice('Translation mode is on. Drag on the image to create notes. <a href="#">Turn translation mode off</a> (shortcut is <span class="key">n</span>).');
Utility.notice("Translation mode is on. Drag on the image to create notes. <a href=\"#\">Turn translation mode off</a> (shortcut is <span class=\"key\">n</span>).");
$("#notice a:contains(Turn translation mode off)").on("click.danbooru", Note.TranslationMode.stop);
},
@ -570,7 +572,7 @@ let Note = {
Note.create(x - offset.left, y - offset.top, w, h);
}
$("#note-container").css('visibility', 'visible');
$("#note-container").css("visibility", "visible");
e.stopPropagation();
e.preventDefault();
},
@ -638,12 +640,12 @@ let Note = {
Note.TranslationMode.Drag.h = -Note.TranslationMode.Drag.dragDistanceY;
}
$('#note-preview').css({
display: 'block',
$("#note-preview").css({
display: "block",
left: (Note.TranslationMode.Drag.x + 1),
top: (Note.TranslationMode.Drag.y + 1),
width: (Note.TranslationMode.Drag.w - 3),
height: (Note.TranslationMode.Drag.h - 3)
height: (Note.TranslationMode.Drag.h - 3),
});
}
},
@ -658,7 +660,7 @@ let Note = {
$(document).off("mousemove", Note.TranslationMode.Drag.drag);
if (Note.TranslationMode.Drag.dragging) {
$('#note-preview').css({ display: 'none' });
$("#note-preview").css({ display: "none" });
Note.TranslationMode.create_note(e, Note.TranslationMode.Drag.x, Note.TranslationMode.Drag.y, Note.TranslationMode.Drag.w - 1, Note.TranslationMode.Drag.h - 1);
Note.TranslationMode.Drag.dragging = false; /* border of the note is pixel-perfect on the preview border */
} else { /* no dragging -> toggle display of notes */
@ -667,8 +669,8 @@ let Note = {
Note.TranslationMode.Drag.dragStartX = 0;
Note.TranslationMode.Drag.dragStartY = 0;
}
}
},
},
},
id: "x",
@ -681,10 +683,10 @@ let Note = {
var $note_box = Note.Box.create(id);
var $note_body = Note.Body.create(id);
$note_box.data('x', x);
$note_box.data('y', y);
$note_box.data('width', w);
$note_box.data('height', h);
$note_box.data("x", x);
$note_box.data("y", y);
$note_box.data("width", w);
$note_box.data("height", h);
container.appendChild($note_box[0]);
container.appendChild($note_body[0]);
$note_body.data("original-body", original_body);
@ -699,7 +701,7 @@ let Note = {
top: y,
left: x,
width: w,
height: h
height: h,
});
Note.Box.update_data_attributes($note_box);
$note_box.find(".note-box-inner-border").addClass("unsaved");
@ -730,7 +732,7 @@ let Note = {
$article.data("width"),
$article.data("height"),
$article.data("body"),
$article.html()
$article.html(),
);
});
$("#note-container").append(fragment);
@ -761,10 +763,10 @@ let Note = {
Note.Box.show_highlighted($note_box);
}
},
}
};
$(function () {
Note.initialize_all();
});
export default Note
export default Note;

10
app/javascript/src/javascripts/pools.js
View File

@ -28,11 +28,11 @@ Pool.initialize_add_to_pool_link = function() {
e.preventDefault();
$("#pool_name").val($(this).attr("data-value"));
});
}
};
Pool.initialize_simple_edit = function () {
$("#sortable").sortable({
placeholder: "ui-state-placeholder"
placeholder: "ui-state-placeholder",
});
$("#sortable").disableSelection();
@ -41,17 +41,17 @@ Pool.initialize_simple_edit = function() {
$.ajax({
type: "post",
url: e.target.action,
data: $("#sortable").sortable("serialize") + "&" + $(e.target).serialize() + "&format=json"
data: $("#sortable").sortable("serialize") + "&" + $(e.target).serialize() + "&format=json",
}).done(() => {
window.location.href = e.target.action;
}).fail((data) => {
Utility.error(`Error: ${data.responseText}`);
});
});
}
};
$(document).ready(function () {
Pool.initialize_all();
});
export default Pool
export default Pool;

6
app/javascript/src/javascripts/post_delete.js
View File

@ -37,7 +37,7 @@ PostDeletion.init = function() {
const $button = $(element);
$button.find("input[type=text]").on("input", () => {
$button.trigger("e621:refresh");
})
});
});
buttons.trigger("e621:refresh");
@ -49,11 +49,11 @@ PostDeletion.init = function() {
$("#delreason-clear").on("click", () => {
input.val("").trigger("input");
});
}
};
$(function () {
if ($("div#c-confirm-delete").length)
Danbooru.PostDeletion.init();
});
export default PostDeletion
export default PostDeletion;

108
app/javascript/src/javascripts/post_mode_menu.js
View File

@ -1,12 +1,12 @@
import Utility from './utility'
import LS from './local_storage'
import Post from './posts'
import Favorite from './favorites'
import PostSet from './post_sets'
import TagScript from './tag_script'
import { SendQueue } from './send_queue'
import Rails from '@rails/ujs'
import Shortcuts from './shortcuts'
import Utility from "./utility";
import LS from "./local_storage";
import Post from "./posts";
import Favorite from "./favorites";
import PostSet from "./post_sets";
import TagScript from "./tag_script";
import { SendQueue } from "./send_queue";
import Rails from "@rails/ujs";
import Shortcuts from "./shortcuts";
let PostModeMenu = {};
@ -19,15 +19,15 @@ PostModeMenu.initialize = function() {
this.initialize_shortcuts();
PostModeMenu.change();
}
}
};
PostModeMenu.initialize_shortcuts = function () {
Shortcuts.keydown("1 2 3 4 5 6 7 8 9 0", "change_tag_script", PostModeMenu.change_tag_script);
}
};
PostModeMenu.show_notice = function (i) {
Utility.notice("Switched to tag script #" + i + ". To switch tag scripts, use the number keys.");
}
};
PostModeMenu.change_tag_script = function (e) {
if ($("#mode-box-mode").val() === "tag-script") {
@ -44,7 +44,7 @@ PostModeMenu.change_tag_script = function(e) {
e.preventDefault();
}
}
};
PostModeMenu.initialize_selector = function () {
if (!LS.get("mode")) {
@ -58,11 +58,11 @@ PostModeMenu.initialize_selector = function() {
PostModeMenu.change();
$("#tag-script-field:visible").focus().select();
});
}
};
PostModeMenu.initialize_preview_link = function () {
$(".post-preview a").on("click.danbooru", PostModeMenu.click);
}
};
PostModeMenu.initialize_edit_form = function () {
$("#quick-edit-div").hide();
@ -77,8 +77,8 @@ PostModeMenu.initialize_edit_form = function() {
url: $("#quick-edit-form").attr("action"),
data: {
post: {
tag_string: $("#post_tag_string").val()
}
tag_string: $("#post_tag_string").val(),
},
},
complete: function () {
Rails.enableElement(document.getElementById("quick-edit-form"));
@ -87,12 +87,12 @@ PostModeMenu.initialize_edit_form = function() {
Post.update_data(data);
Utility.notice("Post #" + data.post.id + " updated");
PostModeMenu.close_edit_form();
}
},
});
e.preventDefault();
});
}
};
PostModeMenu.close_edit_form = function () {
Shortcuts.disabled = false;
@ -100,7 +100,7 @@ PostModeMenu.close_edit_form = function() {
if (Utility.meta("enable-auto-complete") === "true") {
$("#post_tag_string").data("uiAutocomplete").close();
}
}
};
PostModeMenu.initialize_tag_script_field = function () {
$("#tag-script-field").blur(function () {
@ -109,27 +109,27 @@ PostModeMenu.initialize_tag_script_field = function() {
const current_script_id = LS.get("current_tag_script_id");
LS.put("tag-script-" + current_script_id, script);
});
}
};
PostModeMenu.update_sets_menu = function () {
let target = $('#set-id');
target.off('change');
let target = $("#set-id");
target.off("change");
SendQueue.add(function () {
$.ajax({
type: "GET",
url: "/post_sets/for_select.json",
}).fail(function (data) {
$(window).trigger('danbooru:error', "Error getting sets list: " + data.message);
$(window).trigger("danbooru:error", "Error getting sets list: " + data.message);
}).done(function (data) {
target.on('change', function(e) {
LS.put('set', e.target.value);
target.on("change", function (e) {
LS.put("set", e.target.value);
});
target.empty();
const target_set = LS.get('set') || 0;
['Owned', "Maintained"].forEach(function(v) {
let group = $('<optgroup>', {label: v});
const target_set = LS.get("set") || 0;
["Owned", "Maintained"].forEach(function (v) {
let group = $("<optgroup>", {label: v});
data[v].forEach(function (gi) {
group.append($('<option>', {value: gi[1], selected: (gi[1] == target_set)}).text(gi[0]));
group.append($("<option>", {value: gi[1], selected: (gi[1] == target_set)}).text(gi[0]));
});
target.append(group);
});
@ -159,13 +159,13 @@ PostModeMenu.change = function() {
$("#tag-script-field").val(script).show();
PostModeMenu.show_notice(current_script_id);
} else if (s === 'add-to-set' || s === 'remove-from-set') {
} else if (s === "add-to-set" || s === "remove-from-set") {
PostModeMenu.update_sets_menu();
$("#set-id").show();
} else if (s === 'delete') {
} else if (s === "delete") {
$("#quick-mode-reason").show();
}
}
};
PostModeMenu.open_edit = function (post_id) {
Shortcuts.disabled = true;
@ -179,7 +179,7 @@ PostModeMenu.open_edit = function(post_id) {
var padding = $("#post_tag_string").innerHeight() - $("#post_tag_string").height();
var height = $("#post_tag_string").prop("scrollHeight") - padding;
$("#post_tag_string").height(height);
}
};
PostModeMenu.click = function (e) {
var s = $("#mode-box-mode").val();
@ -191,33 +191,33 @@ PostModeMenu.click = function(e) {
Favorite.destroy(post_id);
} else if (s === "edit") {
PostModeMenu.open_edit(post_id);
} else if (s === 'vote-down') {
} else if (s === "vote-down") {
Post.vote(post_id, -1, true);
} else if (s === 'vote-up') {
} else if (s === "vote-up") {
Post.vote(post_id, 1, true);
} else if (s === 'add-to-set') {
} else if (s === "add-to-set") {
PostSet.add_post($("#set-id").val(), post_id);
} else if (s === 'remove-from-set') {
} else if (s === "remove-from-set") {
PostSet.remove_post($("#set-id").val(), post_id);
} else if (s === 'rating-q') {
Post.update(post_id, {"post[rating]": "q"})
} else if (s === 'rating-s') {
Post.update(post_id, {"post[rating]": "s"})
} else if (s === 'rating-e') {
Post.update(post_id, {"post[rating]": "e"})
} else if (s === 'lock-rating') {
} else if (s === "rating-q") {
Post.update(post_id, {"post[rating]": "q"});
} else if (s === "rating-s") {
Post.update(post_id, {"post[rating]": "s"});
} else if (s === "rating-e") {
Post.update(post_id, {"post[rating]": "e"});
} else if (s === "lock-rating") {
Post.update(post_id, {"post[is_rating_locked]": "1"});
} else if (s === 'lock-note') {
} else if (s === "lock-note") {
Post.update(post_id, {"post[is_note_locked]": "1"});
} else if (s === 'delete') {
} else if (s === "delete") {
Post.delete_with_reason(post_id, $("#quick-mode-reason").val(), false);
} else if (s === 'undelete') {
} else if (s === "undelete") {
Post.undelete(post_id);
} else if (s === 'unflag') {
} else if (s === "unflag") {
Post.unflag(post_id, "none", false);
} else if (s === 'approve') {
} else if (s === "approve") {
Post.approve(post_id);
} else if (s === 'remove-parent') {
} else if (s === "remove-parent") {
Post.update(post_id, {"post[parent_id]": ""});
} else if (s === "tag-script") {
const current_script_id = LS.get("current_tag_script_id");
@ -226,7 +226,7 @@ PostModeMenu.click = function(e) {
e.preventDefault();
return;
}
const postTags = $("#post_" + post_id).data('tags').split(' ');
const postTags = $("#post_" + post_id).data("tags").split(" ");
const tags = new Set(postTags);
const changes = TagScript.run(tags, tag_script);
Post.tagScript(post_id, changes);
@ -235,10 +235,10 @@ PostModeMenu.click = function(e) {
}
e.preventDefault();
}
};
$(function () {
PostModeMenu.initialize();
});
export default PostModeMenu
export default PostModeMenu;

20
app/javascript/src/javascripts/post_replacement.js
View File

@ -1,4 +1,4 @@
import Utility from './utility'
import Utility from "./utility";
let PostReplacement = {};
@ -29,9 +29,9 @@ PostReplacement.approve = function (id, penalize_current_uploader) {
type: "PUT",
url: `/post_replacements/${id}/approve.json`,
data: {
penalize_current_uploader: penalize_current_uploader
penalize_current_uploader: penalize_current_uploader,
},
dataType: 'json'
dataType: "json",
}).done(function () {
set_status($row, "approved");
}).fail(function (data) {
@ -48,14 +48,14 @@ PostReplacement.reject = function (id) {
$.ajax({
type: "PUT",
url: `/post_replacements/${id}/reject.json`,
dataType: 'json'
dataType: "json",
}).done(function () {
set_status($row, "rejected");
}).fail(function (data) {
Utility.error(data.responseText);
set_status($row, "rejecting failed");
});
}
};
PostReplacement.promote = function (id) {
if (!confirm("Are you sure you want to promote this replacement?"))
@ -65,7 +65,7 @@ PostReplacement.promote = function (id) {
$.ajax({
type: "POST",
url: `/post_replacements/${id}/promote.json`,
dataType: 'json'
dataType: "json",
}).done(function (data) {
Utility.notice(`Replacement promoted to post #${data.post.id}`);
set_status($row, "promoted");
@ -73,7 +73,7 @@ PostReplacement.promote = function (id) {
Utility.error(data.responseText);
set_status($row, "promoting failed");
});
}
};
PostReplacement.toggle_penalize = function ($target) {
const id = $target.data("replacement-id");
@ -82,14 +82,14 @@ PostReplacement.toggle_penalize = function ($target) {
$.ajax({
type: "PUT",
url: `/post_replacements/${id}/toggle_penalize.json`,
dataType: 'json'
dataType: "json",
}).done(function () {
$target.removeClass("disabled-link");
$currentStatus.text($currentStatus.text() == "yes" ? "no" : "yes");
}).fail(function (data) {
Utility.error(data.responseText);
});
}
};
function make_processing ($row) {
$row.removeClass("replacement-pending-row").addClass("replacement-processing-row");
@ -108,4 +108,4 @@ $(function () {
});
export default PostReplacement
export default PostReplacement;

43
app/javascript/src/javascripts/post_sets.js
View File

@ -1,6 +1,6 @@
import {SendQueue} from './send_queue'
import Post from './posts'
import LS from './local_storage'
import {SendQueue} from "./send_queue";
import Post from "./posts";
import LS from "./local_storage";
let PostSet = {};
@ -14,9 +14,10 @@ PostSet.add_post = function (set_id, post_id) {
url: "/post_sets/" + set_id + "/add_posts.json",
data: {post_ids: [post_id]},
}).fail(function (data) {
var message = $.map(data.responseJSON.errors, function(msg) { return msg; }).join('; ');
console.log(data, data.responseJSON, data.responseJSON.error);
var message = $.map(data.responseJSON.errors, (msg) => msg).join("; ");
Post.notice_update("dec");
$(window).trigger('danbooru:error', "Error: " + message);
$(window).trigger("danbooru:error", "Error: " + message);
}).done(function () {
Post.notice_update("dec");
$(window).trigger("danbooru:notice", "Added post to set");
@ -32,9 +33,9 @@ PostSet.remove_post = function (set_id, post_id) {
url: "/post_sets/" + set_id + "/remove_posts.json",
data: {post_ids: [post_id]},
}).fail(function (data) {
var message = $.map(data.responseJSON.errors, function(msg) { return msg; }).join('; ');
var message = $.map(data.responseJSON.errors, (msg) => msg).join("; ");
Post.notice_update("dec");
$(window).trigger('danbooru:error', "Error: " + message);
$(window).trigger("danbooru:error", "Error: " + message);
}).done(function () {
Post.notice_update("dec");
$(window).trigger("danbooru:notice", "Removed post from set");
@ -55,33 +56,33 @@ PostSet.initialize_add_to_set_link = function() {
$("#add-to-set-submit").on("click", function (e) {
e.preventDefault();
const post_id = $('#image-container').data('id');
const post_id = $("#image-container").data("id");
PostSet.add_post($("#add-to-set-id").val(), post_id);
$('#add-to-set-dialog').dialog('close');
$("#add-to-set-dialog").dialog("close");
});
};
PostSet.update_sets_menu = function () {
const target = $('#add-to-set-id');
const target = $("#add-to-set-id");
target.empty();
target.append($('<option>').text('Loading...'));
target.off('change');
target.append($("<option>").text("Loading..."));
target.off("change");
SendQueue.add(function () {
$.ajax({
type: "GET",
url: "/post_sets/for_select.json",
}).fail(function (data) {
$(window).trigger('danbooru:error', "Error getting sets list: " + data.message);
$(window).trigger("danbooru:error", "Error getting sets list: " + data.message);
}).done(function (data) {
target.on('change', function(e) {
LS.put('set', e.target.value);
})
const target_set = LS.get('set') || 0;
target.on("change", function (e) {
LS.put("set", e.target.value);
});
const target_set = LS.get("set") || 0;
target.empty();
['Owned', "Maintained"].forEach(function(v) {
let group = $('<optgroup>', {label: v});
["Owned", "Maintained"].forEach(function (v) {
let group = $("<optgroup>", {label: v});
data[v].forEach(function (gi) {
group.append($('<option>', {value: gi[1], selected: (gi[1] == target_set)}).text(gi[0]));
group.append($("<option>", {value: gi[1], selected: (gi[1] == target_set)}).text(gi[0]));
});
target.append(group);
});
@ -90,7 +91,7 @@ PostSet.update_sets_menu = function() {
};
$(function () {
if ($("#c-posts").length && $('#a-show').length) {
if ($("#c-posts").length && $("#a-show").length) {
PostSet.initialize_add_to_set_link();
}
});

10
app/javascript/src/javascripts/post_versions.js
View File

@ -1,6 +1,6 @@
import Utility from './utility';
import Utility from "./utility";
import {SendQueue} from "./send_queue";
import Post from './posts';
import Post from "./posts";
let PostVersion = {};
@ -8,11 +8,11 @@ PostVersion.updated = 0;
PostVersion.initialize_all = function () {
if ($("#c-post-versions #a-index").length) {
PostVersion.initialize_undo();
$('#subnav-select-all-link').on('click', function(event) {
$("#subnav-select-all-link").on("click", function (event) {
event.preventDefault();
$(".post-version-select:not(:disabled)").prop("checked", true).change();
});
$("#subnav-apply-tag-script-to-selected-link").on('click', PostVersion.tag_script_selected);
$("#subnav-apply-tag-script-to-selected-link").on("click", PostVersion.tag_script_selected);
}
};
@ -69,7 +69,7 @@ PostVersion.tag_script_selected = function() {
Utility.notice(`${++PostVersion.updated}/${selected_rows.length} changes applied.`);
});
}
}
};
$(document).ready(PostVersion.initialize_all);
export default PostVersion;

358
app/javascript/src/javascripts/posts.js
View File

@ -1,9 +1,9 @@
import Utility from './utility'
import ZingTouch from 'zingtouch'
import LS from './local_storage'
import Note from './notes'
import { SendQueue } from './send_queue'
import Shortcuts from './shortcuts'
import Utility from "./utility";
import ZingTouch from "zingtouch";
import LS from "./local_storage";
import Note from "./notes";
import { SendQueue } from "./send_queue";
import Shortcuts from "./shortcuts";
let Post = {};
@ -39,46 +39,46 @@ Post.initialize_all = function() {
}
$(document).on("danbooru:open-post-edit-tab", () => Shortcuts.disabled = true);
$(document).on("danbooru:open-post-edit-tab", () => $('#post_tag_string').focus());
$(document).on("danbooru:open-post-edit-tab", () => $("#post_tag_string").focus());
$(document).on("danbooru:close-post-edit-tab", () => Shortcuts.disabled = false);
var $fields_multiple = $('[data-autocomplete="tag-edit"]');
var $fields_multiple = $("[data-autocomplete=\"tag-edit\"]");
$fields_multiple.on("keypress.danbooru", Post.update_tag_count);
$fields_multiple.on("click", Post.update_tag_count);
}
};
Post.initialize_moderation = function () {
$("#unapprove-post-link").on('click', e => {
Post.unapprove($(e.target).data('pid'));
$("#unapprove-post-link").on("click", e => {
Post.unapprove($(e.target).data("pid"));
e.preventDefault();
});
$(".unflag-post-link").on('click', e => {
$(".unflag-post-link").on("click", e => {
const $e = $(e.target);
Post.unflag($e.data('pid'), $e.data('type'));
Post.unflag($e.data("pid"), $e.data("type"));
e.preventDefault();
});
};
Post.initialize_collapse = function () {
$('.tag-list-header').on('click', function(e) {
const category = $(e.target).data('category');
$(".tag-list-header").on("click", function (e) {
const category = $(e.target).data("category");
$(`.${category}-tag-list`).toggle();
$(e.target).toggleClass("hidden-category");
e.preventDefault();
});
}
};
Post.initialize_voting = function () {
$(document).on("click.danbooru.post", '.post-vote-up-link', Post.vote_up);
$(document).on("click.danbooru.post", ".post-vote-up-link", Post.vote_up);
$(document).on("click.danbooru.post", ".post-vote-down-link", Post.vote_down);
}
};
Post.initialize_edit_dialog = function () {
$("#open-edit-dialog").show().on("click.danbooru", function (e) {
Post.open_edit_dialog();
e.preventDefault();
});
}
};
Post.open_edit_dialog = function () {
if ($("#edit-dialog").length === 1) {
@ -104,14 +104,14 @@ Post.open_edit_dialog = function() {
position: {
my: "right",
at: "right-20",
of: window
of: window,
},
drag: function () {
if (Utility.meta("enable-auto-complete") === "true") {
$tag_string.data("uiAutocomplete").close();
}
},
close: Post.close_edit_dialog
close: Post.close_edit_dialog,
});
dialog.dialog("widget").draggable("option", "containment", "none");
@ -119,14 +119,16 @@ Post.open_edit_dialog = function() {
pin_button.css({width: "20px", height: "20px", position: "absolute", right: "28.4px"});
dialog.parent().children(".ui-dialog-titlebar").append(pin_button);
pin_button.on("click.danbooru", function () {
var dialog_widget = $('.ui-dialog:has(#edit-dialog)');
var dialog_widget = $(".ui-dialog:has(#edit-dialog)");
var pos = dialog_widget.offset();
if (dialog_widget.css("position") === "absolute") {
pos.left -= $(window).scrollLeft();
pos.top -= $(window).scrollTop();
dialog_widget.offset(pos).css({ position: "fixed" });
dialog.dialog("option", "resize", function() { dialog_widget.css({ position: "fixed" }); });
dialog.dialog("option", "resize", function () {
dialog_widget.css({ position: "fixed" });
});
pin_button.button("option", "icons", {primary: "ui-icon-pin-s"});
} else {
@ -147,7 +149,7 @@ Post.open_edit_dialog = function() {
$tag_string.css({"resize": "none", "width": "100%"});
$tag_string.focus().selectEnd().height($tag_string[0].scrollHeight);
}
};
Post.close_edit_dialog = function () {
$("#form").appendTo($("#c-posts #edit,#c-uploads #a-new"));
@ -157,15 +159,15 @@ Post.close_edit_dialog = function() {
$("#open-edit-dialog").show();
$tag_string.css({"resize": "", "width": ""});
$(document).trigger("danbooru:close-post-edit-dialog");
}
};
Post.has_next_target = function () {
return $(".paginator a[rel~=next]").length || $(".search-seq-nav a[rel~=next]").length || $(".pool-nav li.pool-selected-true a[rel~=next], .set-nav a.active[rel~=next]").length;
}
};
Post.has_prev_target = function () {
return $(".paginator a[rel~=prev]").length || $(".search-seq-nav a[rel~=prev]").length || $(".pool-nav li.pool-selected-true a[rel~=prev], .set-nav a.active[rel~=prev]").length
}
return $(".paginator a[rel~=prev]").length || $(".search-seq-nav a[rel~=prev]").length || $(".pool-nav li.pool-selected-true a[rel~=prev], .set-nav a.active[rel~=prev]").length;
};
/**
* Swipe gesture recognizer that works by averaging the angle/distance/velocity of a gesture path and returning the result.
@ -175,7 +177,7 @@ Post.has_prev_target = function() {
class E6Swipe extends ZingTouch.Swipe {
constructor (options) {
super(options);
this.type = 'e6swipe';
this.type = "e6swipe";
this.minDistance = 150;
}
@ -198,7 +200,7 @@ class E6Swipe extends ZingTouch.Swipe {
// Prevent gestures from triggering while inputs are active.
const activeElement = document.activeElement;
if(activeElement && ['INPUT', 'TEXTAREA', 'SELECT'].indexOf(activeElement.tagName) !== -1)
if (activeElement && ["INPUT", "TEXTAREA", "SELECT"].indexOf(activeElement.tagName) !== -1)
return null;
let output = {
@ -206,7 +208,7 @@ class E6Swipe extends ZingTouch.Swipe {
};
const input = inputs[0];
if(input.current.type !== 'end')
if (input.current.type !== "end")
return null;
const progress = input.getGestureProgress(this.getId());
// Ensure sufficient move data to compute inputs.
@ -257,14 +259,14 @@ Post.initialize_gestures = function() {
if (LS.get("emg") !== "true") {
return;
}
if (!(('ontouchstart' in window) || (navigator.maxTouchPoints > 0)))
if (!(("ontouchstart" in window) || (navigator.maxTouchPoints > 0)))
return;
// Need activeElement to make sure that this doesn't go off during input.
if(!('activeElement' in document))
if (!("activeElement" in document))
return;
const $body = $("body");
if($body.data('zing'))
if ($body.data("zing"))
return;
const zing = new ZingTouch.Region(document.body, false, false);
@ -275,17 +277,17 @@ Post.initialize_gestures = function() {
const hasNext = Post.has_next_target();
if (hasPrev && (angle > 90 - 25 && angle < 90 + 25)) { // right swipe
$("body").css({"transition-timing-function": "ease", "transition-duration": "0.2s", "opacity": "0", "transform": "translateX(150%)"});
Utility.delay(200).then(function() { Post.nav_prev(e); });
Utility.delay(200).then(() => Post.nav_prev(e));
}
if (hasNext && (angle > -90 - 25 && angle < -90 + 25)) { // Left swipe
$("body").css({"transition-timing-function": "ease", "transition-duration": "0.2s", "opacity": "0", "transform": "translateX(-150%)"});
Utility.delay(200).then(function() { Post.nav_next(e); });
Utility.delay(200).then(() => Post.nav_next(e));
}
});
$body.data("zing", zing);
$("#image-container").css({overflow: "visible"});
}
};
Post.nav_prev = function (e) {
var href = "";
@ -305,7 +307,7 @@ Post.nav_prev = function(e) {
}
e.preventDefault();
}
};
Post.nav_next = function (e) {
var href = "";
@ -323,7 +325,7 @@ Post.nav_next = function(e) {
}
e.preventDefault();
}
};
Post.initialize_shortcuts = function () {
if ($("#a-show").length) {
@ -334,48 +336,54 @@ Post.initialize_shortcuts = function() {
Shortcuts.keydown("a", "prev_page", Post.nav_prev);
Shortcuts.keydown("d", "next_page", Post.nav_next);
}
}
};
Post.initialize_links = function () {
$(".undelete-post-link").on('click', e => {
$(".undelete-post-link").on("click", e => {
e.preventDefault();
if (!confirm("Are you sure you want to undelete this post?"))
return;
Post.undelete($(e.target).data('pid'), () => { location.reload(); });
Post.undelete($(e.target).data("pid"), () => {
location.reload();
});
$(".approve-post-link").on('click', e => {
});
$(".approve-post-link").on("click", e => {
e.preventDefault();
Post.approve($(e.target).data('pid'), () => { location.reload(); });
Post.approve($(e.target).data("pid"), () => {
location.reload();
});
$(".approve-post-and-navigate-link").on('click', e => {
});
$(".approve-post-and-navigate-link").on("click", e => {
e.preventDefault();
const $target = $(e.target);
Post.approve($target.data('pid'), () => { location.href = $target.data('location') });
Post.approve($target.data("pid"), () => {
location.href = $target.data("location");
});
$("#destroy-post-link").on('click', e => {
});
$("#destroy-post-link").on("click", e => {
e.preventDefault();
const reason = prompt("This will permanently delete this post (meaning the file will be deleted). What is the reason for destroying the post?")
const reason = prompt("This will permanently delete this post (meaning the file will be deleted). What is the reason for destroying the post?");
if (reason === null) return;
Post.destroy($(e.target).data('pid'), reason);
Post.destroy($(e.target).data("pid"), reason);
});
$("#regenerate-image-samples-link").on('click', e => {
$("#regenerate-image-samples-link").on("click", e => {
e.preventDefault();
Post.regenerate_image_samples($(e.target).data('pid'));
Post.regenerate_image_samples($(e.target).data("pid"));
});
$("#regenerate-video-samples-link").on('click', e => {
$("#regenerate-video-samples-link").on("click", e => {
e.preventDefault();
Post.regenerate_video_samples($(e.target).data('pid'));
Post.regenerate_video_samples($(e.target).data("pid"));
});
$(".disapprove-post-link").on('click', e => {
$(".disapprove-post-link").on("click", e => {
e.preventDefault();
const target = $(e.target);
Post.disapprove(target.data('pid'), target.data('reason'));
Post.disapprove(target.data("pid"), target.data("reason"));
});
$("#set-as-avatar-link").on('click.danbooru', function(e) {
$("#set-as-avatar-link").on("click.danbooru", function (e) {
e.preventDefault();
if (!confirm("Set post as avatar?"))
return;
Post.set_as_avatar($(e.target).data('post-id'));
Post.set_as_avatar($(e.target).data("post-id"));
});
$("#copy-notes").on("click.danbooru", function (e) {
var current_post_id = $("meta[name=post-id]").attr("content");
@ -385,7 +393,7 @@ Post.initialize_links = function() {
$.ajax("/posts/" + current_post_id + "/copy_notes", {
type: "PUT",
data: {
other_post_id: other_post_id
other_post_id: other_post_id,
},
success: function () {
$(window).trigger("danbooru:notice", "Successfully copied notes to <a href='" + other_post_id + "'>post #" + other_post_id + "</a>");
@ -398,13 +406,13 @@ Post.initialize_links = function() {
} else {
$(window).trigger("danbooru:error", "There was an error copying notes to <a href='" + other_post_id + "'>post #" + other_post_id + "</a>");
}
}
},
});
}
e.preventDefault();
});
}
};
Post.initialize_post_relationship_previews = function () {
var current_post_id = $("meta[name=post-id]").attr("content");
@ -413,14 +421,14 @@ Post.initialize_post_relationship_previews = function() {
const toggle = function () {
Post.toggle_relationship_preview($("#has-children-relationship-preview"), $("#has-children-relationship-preview-link"));
Post.toggle_relationship_preview($("#has-parent-relationship-preview"), $("#has-parent-relationship-preview-link"));
}
};
const flip_saved = function () {
if (LS.get("show-relationship-previews") === "1")
LS.put("show-relationship-previews", "0");
else
LS.put("show-relationship-previews", "1");
}
};
if (LS.get("show-relationship-previews") === "1") {
toggle();
@ -435,8 +443,8 @@ Post.initialize_post_relationship_previews = function() {
toggle();
flip_saved();
e.preventDefault();
})
}
});
};
Post.toggle_relationship_preview = function (preview, preview_link) {
preview.toggle();
@ -445,25 +453,25 @@ Post.toggle_relationship_preview = function(preview, preview_link) {
} else {
preview_link.text("show »");
}
}
};
Post.currentPost = function () {
if (!this._currentPost)
this._currentPost = this.fromDOM($("#image-container"));
return this._currentPost;
}
};
Post.fromDOM = function (element) {
if (!element)
return {};
const post = element.attr("data-post") || '{}';
const post = element.attr("data-post") || "{}";
return JSON.parse(post);
}
};
Post.resize_notes = function () {
Note.Box.scale_all();
}
};
Post.resize_video = function (post, target_size) {
const $video = $("video#image");
@ -475,34 +483,34 @@ Post.resize_video = function (post, target_size) {
const scaled_percentage = Math.floor(100 * width / orig_width);
$percentage.text(`${scaled_percentage}%`);
};
$notice.hide()
$notice.hide();
let target_sources = [];
let desired_classes = [];
function original_sources () {
target_sources.push({type: 'video/webm', url: post?.file?.url});
target_sources.push({type: "video/webm", url: post?.file?.url});
if (typeof post?.sample?.alternates?.original !== "undefined")
target_sources.push({type: 'video/mp4', url: post?.sample?.alternates?.original?.urls[1]});
target_sources.push({type: "video/mp4", url: post?.sample?.alternates?.original?.urls[1]});
}
switch (target_size) {
case 'original':
case "original":
original_sources();
break;
case 'fit':
case "fit":
original_sources();
desired_classes.push('fit-window');
desired_classes.push("fit-window");
break;
case 'fitv':
case "fitv":
original_sources();
desired_classes.push('fit-window-vertical');
desired_classes.push("fit-window-vertical");
break;
default: {
$notice.show();
const alternate = post?.sample?.alternates[target_size];
target_sources.push({type: 'video/webm; codecs="vp9"', url: alternate.urls[0]});
target_sources.push({type: 'video/mp4', url: alternate.urls[1]});
desired_classes.push('fit-window');
target_sources.push({type: "video/webm; codecs=\"vp9\"", url: alternate.urls[0]});
target_sources.push({type: "video/mp4", url: alternate.urls[1]});
desired_classes.push("fit-window");
update_resize_percentage(post?.sample?.alternates[target_size]?.width, post?.file?.width);
break;
}
@ -517,8 +525,8 @@ Post.resize_video = function (post, target_size) {
const canPlay = videoTag.canPlayType(source.type);
if (canPlay === "probably" || canPlay === "maybe") {
// This comparison fixes reloading the media on changing between fit modes.
if(source.url !== $video.attr('src')) {
$video.attr('src', source.url);
if (source.url !== $video.attr("src")) {
$video.attr("src", source.url);
videoTag.load(); // Forces changed source to take effect. *SOME* browsers ignore changes otherwise.
}
break;
@ -527,7 +535,7 @@ Post.resize_video = function (post, target_size) {
for (const class_name of desired_classes) {
$video.addClass(class_name);
}
}
};
Post.resize_image = function (post, target_size) {
const $image = $("img#image");
@ -538,43 +546,43 @@ Post.resize_image = function (post, target_size) {
$percentage.text(`${scaled_percentage}%`);
};
$notice.hide();
let desired_url = '';
let desired_url = "";
let desired_classes = [];
switch (target_size) {
case 'original':
case "original":
desired_url = post?.file?.url;
break;
case 'fit':
desired_classes.push('fit-window');
case "fit":
desired_classes.push("fit-window");
desired_url = post?.file?.url;
break;
case 'fitv':
desired_classes.push('fit-window-vertical');
case "fitv":
desired_classes.push("fit-window-vertical");
desired_url = post?.file?.url;
break;
case 'large':
case "large":
$notice.show();
desired_classes.push('fit-window');
desired_classes.push("fit-window");
desired_url = post?.sample?.url;
update_resize_percentage(post?.sample?.width, post?.file?.width);
break;
default:
$notice.show();
desired_classes.push('fit-window');
desired_classes.push("fit-window");
desired_url = post?.sample?.alternates[target_size]?.url;
update_resize_percentage(post?.sample?.alternates[target_size]?.width, post?.file?.width);
break;
}
$image.removeClass();
if ($image.attr('src') !== desired_url) {
$("#image-container").addClass('image-loading');
$image.attr('src', desired_url);
if ($image.attr("src") !== desired_url) {
$("#image-container").addClass("image-loading");
$image.attr("src", desired_url);
}
for (const class_name of desired_classes) {
$image.addClass(class_name);
}
Post.resize_notes();
}
};
Post.resize_to = function (target_size) {
target_size = update_size_selector(target_size);
@ -585,13 +593,13 @@ Post.resize_to = function(target_size) {
} else {
Post.resize_image(post, target_size);
}
}
};
function is_video (post) {
switch (post.file.ext) {
case 'webm':
case 'mp4':
case "webm":
case "mp4":
return true;
default:
return false;
@ -619,60 +627,60 @@ function update_size_selector(choice) {
function most_relevant_sample_size (post) {
let samples = Object.entries(Post.currentPost().sample.alternates);
samples = samples.filter((x) => x[0] !== 'original');
samples = samples.filter((x) => x[0] !== "original");
if (samples.length === 0) {
return 'fit';
return "fit";
}
if (post?.file?.width <= 1280 && post?.file?.height <= 720) {
return 'fit'; // Don't force people onto 480p samples for <720 videos.
return "fit"; // Don't force people onto 480p samples for <720 videos.
}
const differences = samples.map((x) => [x[0], Math.abs(window.outerHeight - x[1].height) * Math.abs(window.outerWidth - x[1].width)]).sort((a,b) => a[1] < b[1] ? -1 : 1);
const differences = samples.map((x) => [x[0], Math.abs(window.outerHeight - x[1].height) * Math.abs(window.outerWidth - x[1].width)]).sort((a, b) => (a[1] < b[1] ? -1 : 1));
return differences[0][0];
}
Post.initialize_resize = function () {
Post.initialize_change_resize_mode_link();
const post = Post.currentPost();
if (post?.file?.ext === 'swf')
if (post?.file?.ext === "swf")
return;
const is_post_video = is_video(post);
if (!is_post_video) {
const $image = $('img#image');
const $image = $("img#image");
if ($image.length > 0 && $image[0]) {
if ($image[0].complete)
Post.resize_notes();
}
$image.on('load', function () {
$image.on("load", function () {
Post.resize_notes();
$("#image-container").removeClass("image-loading");
});
$(window).on('resize', Post.resize_notes);
$(window).on("resize", Post.resize_notes);
}
let image_size = Utility.meta('image-override-size') || Utility.meta("default-image-size");
if(is_post_video && image_size === 'large') {
let image_size = Utility.meta("image-override-size") || Utility.meta("default-image-size");
if (is_post_video && image_size === "large") {
image_size = most_relevant_sample_size(post);
}
Post.resize_to(image_size);
const $selector = $("#image-resize-selector");
$selector.on('change', () => Post.resize_to($selector.val()));
}
$selector.on("change", () => Post.resize_to($selector.val()));
};
Post.resize_cycle_mode = function (e) {
if (e && e.target)
e.preventDefault();
Post.resize_to("next");
}
};
Post.initialize_change_resize_mode_link = function () {
$("#image-resize-link").on("click", (e) => {
e.preventDefault();
Post.resize_to('fit');
Post.resize_to("fit");
}); // For top panel
Shortcuts.keydown('v', 'resize', Post.resize_cycle_mode);
}
Shortcuts.keydown("v", "resize", Post.resize_cycle_mode);
};
Post.initialize_post_sections = function () {
$("#post-sections li a,#side-edit-link").on("click.danbooru", function (e) {
@ -697,7 +705,7 @@ Post.initialize_post_sections = function() {
$(e.target).parent("li").addClass("active");
e.preventDefault();
});
}
};
Post.notice_update = function (x) {
if (x === "inc") {
@ -712,7 +720,7 @@ Post.notice_update = function(x) {
$(window).trigger("danbooru:notice", "Updating posts (" + Post.pending_update_count + " pending)...", true);
}
}
}
};
Post.update_data = function (data) {
var $post = $("#post_" + data.id);
@ -725,17 +733,17 @@ Post.update_data = function(data) {
if (data.has_visible_children) {
$post.addClass("post-status-has-children");
}
}
};
Post.tag = function (post_id, tags) {
const tag_string = (Array.isArray(tags) ? tags.join(" ") : String(tags));
Post.update(post_id, { "post[old_tag_string]": "", "post[tag_string]": tag_string });
}
};
Post.tagScript = function (post_id, tags) {
const tag_string = (Array.isArray(tags) ? tags.join(" ") : String(tags));
Post.update(post_id, { "post[tag_string_diff]": tag_string });
}
};
Post.update = function (post_id, params) {
Post.notice_update("inc");
@ -751,11 +759,11 @@ Post.update = function(post_id, params) {
},
error: function () {
Post.notice_update("dec");
$(window).trigger("danbooru:error", 'There was an error updating <a href="/posts/' + post_id + '">post #' + post_id + '</a>');
}
$(window).trigger("danbooru:error", "There was an error updating <a href=\"/posts/" + post_id + "\">post #" + post_id + "</a>");
},
});
});
}
};
Post.delete_with_reason = function (post_id, reason, reload_after_delete) {
Post.notice_update("inc");
@ -763,54 +771,54 @@ Post.delete_with_reason = function(post_id, reason, reload_after_delete) {
$.ajax({
type: "POST",
url: `/moderator/post/posts/${post_id}/delete.json`,
data: {commit: "Delete", reason: reason, move_favorites: true}
data: {commit: "Delete", reason: reason, move_favorites: true},
}).fail(function (data) {
var message = $.map(data.responseJSON.errors, function(msg) { return msg; }).join('; ');
$(window).trigger('danbooru:error', "Error: " + message);
var message = $.map(data.responseJSON.errors, (msg) => msg).join("; ");
$(window).trigger("danbooru:error", "Error: " + message);
}).done(function () {
$(window).trigger("danbooru:notice", "Deleted post.");
if (reload_after_delete) {
location.reload();
} else {
$(`article#post_${post_id}`).attr('data-flags', 'deleted');
$(`article#post_${post_id}`).attr("data-flags", "deleted");
}
}).always(function () {
Post.notice_update("dec");
});
});
}
};
Post.undelete = function (post_id, callback) {
Post.notice_update("inc");
SendQueue.add(function () {
$.ajax({
type: "POST",
url: `/moderator/post/posts/${post_id}/undelete.json`
url: `/moderator/post/posts/${post_id}/undelete.json`,
}).fail(function (data) {
// var message = $.map(data.responseJSON.errors, function(msg, attr) { return msg; }).join('; ');
const message = data.responseJSON.message;
$(window).trigger('danbooru:error', "Error: " + message);
$(window).trigger("danbooru:error", "Error: " + message);
}).done(function () {
$(window).trigger("danbooru:notice", "Undeleted post.");
$(`article#post_${post_id}`).attr('data-flags', 'active');
$(`article#post_${post_id}`).attr("data-flags", "active");
if (callback) callback();
}).always(function () {
Post.notice_update("dec");
});
});
}
};
Post.unflag = function (post_id, approval, reload = true) {
Post.notice_update("inc");
let modApproval = approval || 'none';
let modApproval = approval || "none";
SendQueue.add(function () {
$.ajax({
type: "DELETE",
url: `/posts/${post_id}/flag.json`,
data: {approval: modApproval}
data: {approval: modApproval},
}).fail(function (data) {
const message = data.responseJSON.message;
$(window).trigger('danbooru:error', "Error: " + message);
$(window).trigger("danbooru:error", "Error: " + message);
}).done(function () {
$(window).trigger("danbooru:notice", "Unflagged post");
if (reload) {
@ -820,7 +828,7 @@ Post.unflag = function(post_id, approval, reload = true) {
Post.notice_update("dec");
});
});
}
};
Post.unapprove = function (post_id) {
Post.notice_update("inc");
@ -828,10 +836,10 @@ Post.unapprove = function(post_id) {
$.ajax({
type: "DELETE",
url: "/moderator/post/approval.json",
data: {post_id: post_id}
data: {post_id: post_id},
}).fail(function (data) {
var message = $.map(data.responseJSON.errors, function(msg) { return msg; }).join('; ');
$(window).trigger('danbooru:error', "Error: " + message);
var message = $.map(data.responseJSON.errors, (msg) => msg).join("; ");
$(window).trigger("danbooru:error", "Error: " + message);
}).done(function () {
$(window).trigger("danbooru:notice", "Unapproved post.");
location.reload();
@ -839,12 +847,12 @@ Post.unapprove = function(post_id) {
Post.notice_update("dec");
});
});
}
};
Post.destroy = function (post_id, reason) {
$.post(`/moderator/post/posts/${post_id}/expunge.json`, { reason }
$.post(`/moderator/post/posts/${post_id}/expunge.json`, { reason },
).fail(data => {
var message = $.map(data.responseJSON.errors, function(msg) { return msg; }).join("; ");
var message = $.map(data.responseJSON.errors, (msg) => msg).join("; ");
$(window).trigger("danbooru:error", "Error: " + message);
}).done(() => {
location.href = `/admin/destroyed_posts/${post_id}`;
@ -852,7 +860,7 @@ Post.destroy = function(post_id, reason) {
};
Post.regenerate_image_samples = function (post_id) {
$.post(`/moderator/post/posts/${post_id}/regenerate_thumbnails.json`, {}
$.post(`/moderator/post/posts/${post_id}/regenerate_thumbnails.json`, {},
).fail(data => {
Utility.error("Error: " + data.responseJSON.reason);
}).done(() => {
@ -861,7 +869,7 @@ Post.regenerate_image_samples = function(post_id) {
};
Post.regenerate_video_samples = function (post_id) {
$.post(`/moderator/post/posts/${post_id}/regenerate_videos.json`, {}
$.post(`/moderator/post/posts/${post_id}/regenerate_videos.json`, {},
).fail(data => {
Utility.error("Error: " + data.responseJSON.reason);
}).done(() => {
@ -874,9 +882,9 @@ Post.approve = function(post_id, callback) {
SendQueue.add(function () {
$.post(
"/moderator/post/approval.json",
{ "post_id": post_id }
{ "post_id": post_id },
).fail(function (data) {
const message = $.map(data.responseJSON.errors, function(msg) { return msg; }).join("; ");
var message = $.map(data.responseJSON.errors, (msg) => msg).join("; ");
Danbooru.error("Error: " + message);
}).done(function () {
var $post = $("#post_" + post_id);
@ -892,16 +900,16 @@ Post.approve = function(post_id, callback) {
Post.notice_update("dec");
});
});
}
};
Post.disapprove = function (post_id, reason, message) {
Post.notice_update("inc");
SendQueue.add(function () {
$.post(
"/moderator/post/disapprovals.json",
{"post_disapproval[post_id]": post_id, "post_disapproval[reason]": reason, "post_disapproval[message]": message}
{"post_disapproval[post_id]": post_id, "post_disapproval[reason]": reason, "post_disapproval[message]": message},
).fail(function (data) {
var message = $.map(data.responseJSON.errors, function(msg) { return msg; }).join("; ");
var message = $.map(data.responseJSON.errors, (msg) => msg).join("; ");
$(window).trigger("danbooru:error", "Error: " + message);
}).done(function () {
if ($("#c-posts #a-show").length) {
@ -922,7 +930,7 @@ Post.update_tag_count = function(event) {
let tags = [...new Set($(event.target).val().match(/\S+/g))];
if (tags) {
count = tags.length;
string = (count == 1) ? (count + " tag") : (count + " tags")
string = (count == 1) ? (count + " tag") : (count + " tags");
}
}
$("#tags-container .count").html(string);
@ -933,75 +941,75 @@ Post.update_tag_count = function(event) {
klass = "meh";
}
$("#tags-container .options #face").removeClass().addClass(`fa-regular fa-face-${klass}`);
}
};
Post.vote_up = function (e) {
var id = $(e.target).parent().attr('data-id');
var id = $(e.target).parent().attr("data-id");
Post.vote(id, 1);
}
};
Post.vote_down = function (e) {
var id = $(e.target).parent().attr('data-id');
var id = $(e.target).parent().attr("data-id");
Post.vote(id, -1);
}
};
Post.vote = function (id, score, prevent_unvote) {
Post.notice_update("inc");
SendQueue.add(function () {
$.ajax({
method: 'POST',
method: "POST",
url: `/posts/${id}/votes.json`,
data: {
score: score,
no_unvote: prevent_unvote === true
no_unvote: prevent_unvote === true,
},
dataType: 'json',
dataType: "json",
headers: {
accept: '*/*;q=0.5,text/javascript'
}
accept: "*/*;q=0.5,text/javascript",
},
}).done(function (data) {
const scoreClasses = 'score-neutral score-positive score-negative';
const scoreClasses = "score-neutral score-positive score-negative";
const postID = id;
const postScore = data.score;
const ourScore = data.our_score;
function scoreToClass (inScore) {
if(inScore == 0) return 'score-neutral';
return inScore > 0 ? 'score-positive' : 'score-negative';
if (inScore == 0) return "score-neutral";
return inScore > 0 ? "score-positive" : "score-negative";
}
$(".post-score-" + postID).removeClass(scoreClasses);
$(".post-vote-up-" + postID).removeClass(scoreClasses);
$(".post-vote-down-" + postID).removeClass(scoreClasses);
$('.post-score-'+postID).text(postScore);
$('.post-score-'+postID).attr('title', `${data.up} up/${data.down} down`);
$(".post-score-" + postID).text(postScore);
$(".post-score-" + postID).attr("title", `${data.up} up/${data.down} down`);
$(".post-score-" + postID).addClass(scoreToClass(postScore));
$('.post-vote-up-'+postID).addClass(ourScore > 0 ? 'score-positive' : 'score-neutral');
$('.post-vote-down-'+postID).addClass(ourScore < 0 ? 'score-negative' : 'score-neutral');
$(window).trigger('danbooru:notice', 'Vote saved');
$(".post-vote-up-" + postID).addClass(ourScore > 0 ? "score-positive" : "score-neutral");
$(".post-vote-down-" + postID).addClass(ourScore < 0 ? "score-negative" : "score-neutral");
$(window).trigger("danbooru:notice", "Vote saved");
}).always(function () {
Post.notice_update("dec");
});
});
}
};
Post.set_as_avatar = function (id) {
SendQueue.add(function () {
$.ajax({
method: 'PATCH',
method: "PATCH",
url: `/users/${Utility.meta("current-user-id")}.json`,
data: {
'user[avatar_id]': id
"user[avatar_id]": id,
},
headers: {
accept: '*/*;q=0.5,text/javascript'
}
accept: "*/*;q=0.5,text/javascript",
},
}).done(function () {
$(window).trigger("danbooru:notice", "Post set as avatar");
});
});
}
};
$(document).ready(function () {
Post.initialize_all();
});
export default Post
export default Post;

2
app/javascript/src/javascripts/related_tag.js
View File

@ -11,7 +11,7 @@ RelatedTag.init_post_show_editor = function() {
const app = createApp(TagEditor);
app.mount("#tag-string-editor");
}
};
$(function () {
$(document).on("danbooru:open-post-edit-tab", RelatedTag.init_post_show_editor);

4
app/javascript/src/javascripts/replacer.js
View File

@ -5,5 +5,5 @@ export default {
init () {
const app = createApp(Replacer);
app.mount("#replacement-uploader");
}
}
},
};

6
app/javascript/src/javascripts/responsive.js
View File

@ -1,8 +1,8 @@
$(function () {
$("#maintoggle").on("click.danbooru", function (e) {
e.preventDefault();
$('#nav').toggle();
$('#maintoggle-on').toggle();
$('#maintoggle-off').toggle();
$("#nav").toggle();
$("#maintoggle-on").toggle();
$("#maintoggle-off").toggle();
});
});

12
app/javascript/src/javascripts/shortcuts.js
View File

@ -1,4 +1,4 @@
import Utility from './utility'
import Utility from "./utility";
let Shortcuts = {};
Shortcuts.disabled = false;
@ -7,7 +7,7 @@ Shortcuts.initialize = function() {
Shortcuts.keydown("s", "scroll_down", Shortcuts.nav_scroll_down);
Shortcuts.keydown("w", "scroll_up", Shortcuts.nav_scroll_up);
Shortcuts.initialize_data_shortcuts();
}
};
// Bind keyboard shortcuts to links that have a `data-shortcut="..."` attribute. If multiple links have the
// same shortcut, then only the first link will be triggered by the shortcut.
@ -15,7 +15,7 @@ Shortcuts.initialize_data_shortcuts = function() {
$(document).off("keydown.danbooru.shortcut");
$("[data-shortcut]").each((_i, element) => {
const $e = $(element)
const $e = $(element);
const id = $e.attr("id");
const keys = $e.attr("data-shortcut");
const namespace = `shortcut.${id}`;
@ -53,14 +53,14 @@ Shortcuts.keydown = function(keys, namespace, handler) {
Shortcuts.nav_scroll_down = function () {
window.scrollBy(0, $(window).height() * 0.15);
}
};
Shortcuts.nav_scroll_up = function () {
window.scrollBy(0, $(window).height() * -0.15);
}
};
$(document).ready(function () {
Shortcuts.initialize();
});
export default Shortcuts
export default Shortcuts;

20
app/javascript/src/javascripts/tag_relationships.js
View File

@ -1,4 +1,4 @@
import Utility from './utility.js';
import Utility from "./utility.js";
class TagRelationships {
static approve (e) {
@ -15,11 +15,11 @@ class TagRelationships {
$.ajax({
url: `/${route}/${id}/approve.json`,
type: 'POST',
dataType: 'json'
type: "POST",
dataType: "json",
}).done(function () {
Utility.notice(`Accepted ${human}.`);
parent.slideUp('fast');
parent.slideUp("fast");
}).fail(function () {
Utility.error(`Failed to accept ${human}.`);
});
@ -39,11 +39,11 @@ class TagRelationships {
$.ajax({
url: `/${route}/${id}.json`,
type: 'DELETE',
dataType: 'json'
type: "DELETE",
dataType: "json",
}).done(function () {
Utility.notice(`Rejected ${human}.`);
parent.slideUp('fast');
parent.slideUp("fast");
}).fail(function () {
Utility.error(`Failed to reject ${human}.`);
});
@ -51,12 +51,12 @@ class TagRelationships {
}
$(document).ready(function () {
$(".tag-relationship-accept").on('click', e => {
$(".tag-relationship-accept").on("click", e => {
TagRelationships.approve(e);
});
$(".tag-relationship-reject").on('click', e => {
$(".tag-relationship-reject").on("click", e => {
TagRelationships.reject(e);
});
});
export default TagRelationships
export default TagRelationships;

9
app/javascript/src/javascripts/tag_script.js
View File

@ -1,12 +1,13 @@
/* eslint-disable comma-dangle */
const TagScript = {
parse (script) {
return script.match(/\[.+?\]|\S+/g)
return script.match(/\[.+?\]|\S+/g);
},
test (tags, predicate) {
const split_pred = predicate.match(/\S+/g);
for (const x of split_pred) {
if (x[0] === '-') {
if (x[0] === "-") {
if (tags.has(x.substr(1))) {
return false;
}
@ -21,7 +22,7 @@ const TagScript = {
if (command.match(/^\[if/)) {
const match = command.match(/\[if\s+(.+?)\s*,\s*(.+?)\]/);
if (TagScript.test(tags, match[1])) {
return TagScript.process(tags, match[2])
return TagScript.process(tags, match[2]);
} else {
return null;
}
@ -41,7 +42,7 @@ const TagScript = {
changes.push(result);
}
}
return changes.join(' ');
return changes.join(" ");
}
};

48
app/javascript/src/javascripts/takedowns.js
View File

@ -1,9 +1,9 @@
import Utility from './utility.js';
import Utility from "./utility.js";
let Takedown = {};
Takedown.destroy = function (id) {
Utility.notice('Deleting takedown #' + id + "...");
Utility.notice("Deleting takedown #" + id + "...");
$.ajax({
url: "/takedown/destroy.json",
@ -11,8 +11,8 @@ Takedown.destroy = function (id) {
dataType: "json",
headers: {accept: "text/javascript"},
data: {
"id": id
}
"id": id,
},
}).done(function () {
Utility.notice("Takedown deleted");
$("#takedown-" + id).fadeOut("fast");
@ -30,8 +30,8 @@ Takedown.add_posts_by_tags_preview = function (id) {
headers: {accept: "text/javascript"},
data: {
id: id,
post_tags: tags
}
post_tags: tags,
},
}).done(function (data) {
var count = data.matched_post_count;
var preview_text = "<a href='/post/index?tags=" + tags.replace(" ", "+") + "+status:any'>" + count + " " + (count == 1 ? "post" : "posts") + "</a> " + (count == 1 ? "matches" : "match") + " the search '<a href='/post/index?tags=" + tags.replace(" ", "+") + "+status:any'>" + tags + "</a>'. Click Confirm to add " + (count == 1 ? "it" : "them") + " to the takedown.";
@ -48,7 +48,7 @@ Takedown.add_posts_by_tags_preview = function (id) {
Takedown.add_posts_by_tags_cancel = function () {
$("#takedown-add-posts-tags-warning").hide();
$("#takedown-add-posts-tags").val('').prop("disabled", false);
$("#takedown-add-posts-tags").val("").prop("disabled", false);
$("#takedown-add-posts-tags-preview").show().prop("disabled", true);
$("#takedown-add-posts-tags-confirm").hide();
$("#takedown-add-posts-tags-cancel").hide();
@ -66,8 +66,8 @@ Takedown.add_posts_by_tags = function (id) {
headers: {accept: "text/javascript"},
data: {
id: id,
post_tags: tags
}
post_tags: tags,
},
}).done(function (data) {
const added_post_ids = data.added_post_ids;
const count = added_post_ids.length;
@ -98,8 +98,8 @@ Takedown.add_posts_by_ids = function (id) {
headers: {accept: "text/javascript"},
data: {
id: id,
post_ids: post_ids
}
post_ids: post_ids,
},
}).done(function (data) {
Utility.notice(data.added_count + " post" + (data.added_count == 1 ? "" : "s") + " added to takedown");
@ -109,7 +109,7 @@ Takedown.add_posts_by_ids = function (id) {
$(html).appendTo($("#takedown-post-buttons"));
}
$("#takedown-add-posts-ids").val('');
$("#takedown-add-posts-ids").val("");
$("#takedown-add-posts-ids-submit").prop("disabled", true);
}).fail(function (data) {
Utility.error(data.responseText);
@ -126,10 +126,10 @@ Takedown.remove_post = function (id, post_id) {
headers: {accept: "text/javascript"},
data: {
id: id,
post_ids: post_id
}
post_ids: post_id,
},
}).done(function () {
Utility.notice("Post #" + post_id + " removed from takedown")
Utility.notice("Post #" + post_id + " removed from takedown");
$("#takedown-post-" + post_id).remove();
}).fail(function (data) {
Utility.error(data.responseText);
@ -141,21 +141,21 @@ Takedown.post_button_html = function (post_id) {
};
$(document).ready(function () {
$("#takedown-add-posts-ids-submit").on('click', e => {
$("#takedown-add-posts-ids-submit").on("click", e => {
const $e = $(e.target);
Takedown.add_posts_by_ids($e.data('tid'));
Takedown.add_posts_by_ids($e.data("tid"));
});
$("#takedown-add-posts-tags-cancel").on('click', () => {
$("#takedown-add-posts-tags-cancel").on("click", () => {
Takedown.add_posts_by_tags_cancel();
});
$("#takedown-add-posts-tags-confirm").on('click', e => {
$("#takedown-add-posts-tags-confirm").on("click", e => {
const $e = $(e.target);
Takedown.add_posts_by_tags($e.data('tid'));
Takedown.add_posts_by_tags($e.data("tid"));
});
$("#takedown-add-posts-tags-preview").on('click', e => {
$("#takedown-add-posts-tags-preview").on("click", e => {
const $e = $(e.target);
Takedown.add_posts_by_tags_preview($e.data('tid'));
})
Takedown.add_posts_by_tags_preview($e.data("tid"));
});
});
export default Takedown
export default Takedown;

38
app/javascript/src/javascripts/thumbnails.js
View File

@ -1,22 +1,22 @@
import Blacklist from './blacklists';
import LS from './local_storage';
import Blacklist from "./blacklists";
import LS from "./local_storage";
const Thumbnails = {};
Thumbnails.initialize = function () {
const clearPlaceholder = function (post) {
if (post.hasClass('thumb-placeholder-link')) {
post.removeClass('thumb-placeholder-link');
if (post.hasClass("thumb-placeholder-link")) {
post.removeClass("thumb-placeholder-link");
} else {
post.empty();
}
};
const postsData = window.___deferred_posts || {};
const posts = $('.post-thumb.placeholder, .thumb-placeholder-link');
const posts = $(".post-thumb.placeholder, .thumb-placeholder-link");
const DAB = LS.get("dab") === "1";
$.each(posts, function (i, post) {
const p = $(post);
const postID = p.data('id');
const postID = p.data("id");
if (!postID) {
clearPlaceholder(p);
return;
@ -33,25 +33,25 @@ Thumbnails.initialize = function () {
blacklist_hit_count += 1;
}
});
const newTag = $('<div>');
const newTag = $("<div>");
const blacklisted = DAB ? false : blacklist_hit_count > 0;
for (const key in postData) {
newTag.attr("data-" + key.replace(/_/g, '-'), postData[key]);
newTag.attr("data-" + key.replace(/_/g, "-"), postData[key]);
}
newTag.attr('class', blacklisted ? "post-thumbnail blacklisted" : "post-thumbnail");
if (p.hasClass('thumb-placeholder-link'))
newTag.addClass('dtext');
const img = $('<img>');
img.attr('src', postData.preview_url || '/images/deleted-preview.png');
newTag.attr("class", blacklisted ? "post-thumbnail blacklisted" : "post-thumbnail");
if (p.hasClass("thumb-placeholder-link"))
newTag.addClass("dtext");
const img = $("<img>");
img.attr("src", postData.preview_url || "/images/deleted-preview.png");
img.attr({
height: postData.preview_url ? postData.preview_height : 150,
width: postData.preview_url ? postData.preview_width : 150,
title: `Rating: ${postData.rating}\r\nID: ${postData.id}\r\nStatus: ${postData.status}\r\nDate: ${postData.created_at}\r\n\r\n${postData.tags}`,
alt: postData.tags,
class: 'post-thumbnail-img'
class: "post-thumbnail-img",
});
const link = $('<a>');
link.attr('href', `/posts/${postData.id}`);
const link = $("<a>");
link.attr("href", `/posts/${postData.id}`);
link.append(img);
newTag.append(link);
p.replaceWith(newTag);
@ -60,12 +60,12 @@ Thumbnails.initialize = function () {
$(document).ready(function () {
Thumbnails.initialize();
$(window).on('e621:add_deferred_posts', (_, posts) => {
window.___deferred_posts = window.___deferred_posts || {}
$(window).on("e621:add_deferred_posts", (_, posts) => {
window.___deferred_posts = window.___deferred_posts || {};
window.___deferred_posts = $.extend(window.___deferred_posts, posts);
Thumbnails.initialize();
});
$(document).on('thumbnails:apply', Thumbnails.initialize);
$(document).on("thumbnails:apply", Thumbnails.initialize);
});
export default Thumbnails;

10
app/javascript/src/javascripts/uploader.js
View File

@ -1,9 +1,9 @@
import Uploader from './uploader/uploader.vue.erb';
import { createApp } from 'vue';
import Uploader from "./uploader/uploader.vue.erb";
import { createApp } from "vue";
export default {
init () {
const app = createApp(Uploader);
app.mount('#uploader');
}
}
app.mount("#uploader");
},
};

24
app/javascript/src/javascripts/user_warning.js
View File

@ -1,22 +1,22 @@
import Blip from './blips.js';
import Comment from './comments.js';
import DText from './dtext.js';
import ForumPost from './forum_posts.js';
import Utility from './utility.js';
import Blip from "./blips.js";
import Comment from "./comments.js";
import DText from "./dtext.js";
import ForumPost from "./forum_posts.js";
import Utility from "./utility.js";
class UserWarnable {
static initialize_click_handlers () {
$('.item-mark-user-warned').on('click', evt => {
$(".item-mark-user-warned").on("click", evt => {
evt.preventDefault();
const target = $(evt.target);
const type = target.data('item-route');
const id = target.data('item-id');
const item_type = target.data('item-type');
const record_type = target.data('record-type');
const type = target.data("item-route");
const id = target.data("item-id");
const item_type = target.data("item-type");
const record_type = target.data("record-type");
const message = record_type === "unmark"
? `Are you sure you want to unmark this ${item_type}?`
: `Are you sure you want to mark this ${item_type} for having received ${record_type}?`
: `Are you sure you want to mark this ${item_type} for having received ${record_type}?`;
if (!confirm(message)) {
return;
}
@ -25,7 +25,7 @@ class UserWarnable {
type: "POST",
url: `/${type}/${id}/warning.json`,
data: {
'record_type': record_type
"record_type": record_type,
},
}).done(data => {
target.closest("article.blip, article.comment, article.forum-post").replaceWith(data.html);

50
app/javascript/src/javascripts/utility.js
View File

@ -4,27 +4,27 @@ let Utility = {};
Utility.delay = function (milliseconds) {
return new Promise(resolve => setTimeout(resolve, milliseconds));
}
};
Utility.meta = function (key) {
return $("meta[name=" + key + "]").attr("content");
}
};
Utility.test_max_width = function (width) {
if (!window.matchMedia) {
return false;
}
var mq = window.matchMedia('(max-width: ' + width + 'px)');
var mq = window.matchMedia("(max-width: " + width + "px)");
return mq.matches;
}
};
Utility.notice_timeout_id = undefined;
Utility.notice = function (msg, permanent) {
$('#notice').addClass("ui-state-highlight").removeClass("ui-state-error").fadeIn("fast").children("span").html(msg);
$("#notice").addClass("ui-state-highlight").removeClass("ui-state-error").fadeIn("fast").children("span").html(msg);
if (Utility.notice_timeout_id !== undefined) {
clearTimeout(Utility.notice_timeout_id)
clearTimeout(Utility.notice_timeout_id);
}
if (!permanent) {
Utility.notice_timeout_id = setTimeout(function () {
@ -32,15 +32,15 @@ Utility.notice = function(msg, permanent) {
Utility.notice_timeout_id = undefined;
}, 6000);
}
}
};
Utility.error = function (msg) {
$('#notice').removeClass("ui-state-highlight").addClass("ui-state-error").fadeIn("fast").children("span").html(msg);
$("#notice").removeClass("ui-state-highlight").addClass("ui-state-error").fadeIn("fast").children("span").html(msg);
if (Utility.notice_timeout_id !== undefined) {
clearTimeout(Utility.notice_timeout_id)
}
clearTimeout(Utility.notice_timeout_id);
}
};
Utility.dialog = function (title, html) {
const $dialog = $(html).dialog({
@ -58,14 +58,14 @@ Utility.dialog = function(title, html) {
},
"Cancel": function () {
$dialog.dialog("close");
}
}
},
},
});
$dialog.find("form").on("submit.danbooru", function () {
$dialog.dialog("close");
});
}
};
// TODO: Remove 2024-05-15
Object.defineProperty(Utility, "disableShortcuts", {
@ -75,13 +75,13 @@ Object.defineProperty(Utility, "disableShortcuts", {
},
set (value) {
console.log("Utility.disableShortcuts is deprecated and will be removed at a later date, use Shortcuts.disabled instead");
Shortcuts.disabled = value
}
})
Shortcuts.disabled = value;
},
});
Utility.keydown = function (keys, namespace, handler) {
console.log("Utility.keydown is deprecated and will be removed at a later date, use Shortcuts.keydown instead");
Shortcuts.keydown(keys, namespace, handler)
Shortcuts.keydown(keys, namespace, handler);
};
Utility.is_subset = function (array, subarray) {
@ -94,7 +94,7 @@ Utility.is_subset = function(array, subarray) {
});
return all;
}
};
Utility.intersect = function (a, b) {
a = a.slice(0).sort();
@ -111,27 +111,27 @@ Utility.intersect = function(a, b) {
}
}
return result;
}
};
Utility.regexp_escape = function (string) {
return string.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
}
};
$.fn.selectEnd = function () {
return this.each(function () {
this.focus();
this.setSelectionRange(this.value.length, this.value.length);
})
}
});
};
$(function () {
$(window).on("danbooru:notice", function (event, msg) {
Utility.notice(msg);
})
});
$(window).on("danbooru:error", function (event, msg) {
Utility.error(msg);
})
});
});
export default Utility
export default Utility;

32
app/javascript/src/javascripts/vote_manager.js
View File

@ -1,4 +1,4 @@
import Utility from './utility';
import Utility from "./utility";
class VoteManager {
constructor (itemType) {
@ -10,39 +10,39 @@ class VoteManager {
init () {
const self = this;
self.lastSelected = 0;
$("#votes").on('click', 'tbody tr', function (evt) {
$("#votes").on("click", "tbody tr", function (evt) {
if ($(evt.target).is("a")) return;
evt.preventDefault();
if (evt.shiftKey) {
self.toggleRowsBetween([self.lastSelected, this.rowIndex]);
}
$(this).toggleClass('selected');
$(this).toggleClass("selected");
self.lastSelected = this.rowIndex;
});
$("#select-all-votes").on('click', () => self.selectAll());
$("#lock-votes").on('click', () => self.lockVotes());
$("#delete-votes").on('click', () => self.deleteVotes());
$("#select-all-votes").on("click", () => self.selectAll());
$("#lock-votes").on("click", () => self.lockVotes());
$("#delete-votes").on("click", () => self.deleteVotes());
}
selectAll () {
this.allSelected = !this.allSelected;
if (this.allSelected)
$('#votes').find('tr').addClass('selected');
$("#votes").find("tr").addClass("selected");
else
$('#votes').find('tr').removeClass('selected');
$("#votes").find("tr").removeClass("selected");
}
toggleRowsBetween (indices) {
this.lastSelected = indices[1];
let rows = $('#votes').find('tr');
let rows = $("#votes").find("tr");
indices = indices.sort();
rows = rows.slice(indices[0], indices[1]);
rows.toggleClass('selected');
rows.toggleClass("selected");
}
selectedVotes () {
return $("#votes>tbody>tr.selected").map(function () {
return $(this).attr('id').substr(1);
return $(this).attr("id").substr(1);
}).get();
}
@ -53,8 +53,8 @@ class VoteManager {
url: `/${this._type}_votes/lock.json`,
method: "post",
data: {
ids: votes.join(',')
}
ids: votes.join(","),
},
}).done(() => {
Utility.notice(`${this._type} votes locked.`);
});
@ -67,10 +67,10 @@ class VoteManager {
url: `/${this._type}_votes/delete.json`,
method: "post",
data: {
ids: votes.join(',')
}
ids: votes.join(","),
},
}).done(() => {
Utility.notice(`${this._type} votes deleted.`)
Utility.notice(`${this._type} votes deleted.`);
});
}
}

14
eslint.config.mjs
View File

@ -21,14 +21,13 @@ export default [
"no-unused-vars": "warn",
// https://eslint.style/packages/js
/*
"array-bracket-newline": "warn",
"array-bracket-spacing": "off",
"array-element-newline": ["warn", "consistent"],
"arrow-parens": "off",
"arrow-spacing": "warn",
"block-spacing": "warn",
"brace-style": "warn",
"brace-style": ["warn", "1tbs", { allowSingleLine: true }],
"comma-dangle": ["warn", "always-multiline"],
"comma-spacing": "warn",
"comma-style": "warn",
@ -38,21 +37,21 @@ export default [
"function-call-argument-newline": ["warn", "consistent"],
"func-call-spacing": "warn", // function-call-spacing does not work ???
"implicit-arrow-linebreak": "warn",
"indent": ["warn", 2],
"key-spacing": ["warn", { "align": "value" }], // Might get annoying
"indent": ["warn", 2, { SwitchCase: 1, }],
"key-spacing": ["warn", { mode: "minimum" }],
"keyword-spacing": "warn",
"line-comment-position": "off",
"linebreak-style": "error",
"lines-around-comment": "off",
"lines-between-class-members": "warn",
"max-len": "warn", // Might get annoying, see https://eslint.style/rules/js/max-len
// "max-len": ["warn", { code: 100, tabWidth: 2, ignoreComments: true }], // Might get annoying, see https://eslint.style/rules/js/max-len
"max-statements-per-line": "warn",
"multiline-comment-style": "off",
"multiline-ternary": ["warn", "always-multiline"],
"new-parens": "warn",
"newline-per-chained-call": "off",
"no-confusing-arrow": "warn",
"no-extra-parens": "warn",
"no-extra-parens": "off",
"no-extra-semi": "warn",
"no-floating-decimal": "warn",
"no-mixed-operators": "error",
@ -63,7 +62,7 @@ export default [
"no-trailing-spaces": "warn",
"no-whitespace-before-property": "warn",
"nonblock-statement-body-position": "off",
"object-curly-newline": ["warn", { "consistent": true }],
"object-curly-newline": ["warn", { consistent: true }],
"one-var-declaration-per-line": "off",
"operator-linebreak": ["warn", "before"],
"padded-blocks": "off",
@ -83,7 +82,6 @@ export default [
"switch-colon-spacing": "warn",
"template-curly-spacing": "warn",
"template-tag-spacing": "warn",
*/
},
},
]