jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert keyboard shortcuts to use data-shortcut.

Browse Source
This commit is contained in:
evazion
2018-08-11 16:39:45 -05:00
parent d369d38419
commit bbaadda1e3
25 changed files with 44 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/src/javascripts/artists.js
View File

@@ -1,11 +1,8 @@
import Utility from "./utility";
let Artist = {};
Artist.initialize_all = function() {
if ($("#c-artists").length) {
Artist.initialize_check_name();
Artist.initialize_shortcuts();
}
}
@@ -29,18 +26,6 @@ Artist.initialize_check_name = function() {
});
}
Artist.initialize_shortcuts = function() {
if ($("#c-artists #a-show").length) {
Utility.keydown("e", "edit", function(e) {
$("#artist-edit a")[0].click();
});
Utility.keydown("shift+d", "delete", function(e) {
$("#artist-delete a")[0].click();
});
}
};
$(document).ready(function() {
Artist.initialize_all();
});

16
app/javascript/src/javascripts/favorite_groups.js
View File

@@ -1,11 +1,8 @@
import Utility from './utility'
let FavoriteGroup = {};
FavoriteGroup.initialize_all = function() {
if ($("#c-posts").length && $("#a-show").length) {
this.initialize_add_to_favgroup_dialog();
Utility.keydown("1 2 3 4 5 6 7 8 9 0", "add_to_favgroup", FavoriteGroup.add_to_favgroup);
}
}
@@ -21,10 +18,6 @@ FavoriteGroup.initialize_add_to_favgroup_dialog = function() {
});
var open_favgroup_dialog = function(e) {
if (Utility.meta("current-user-id") === "") { // anonymous
return;
}
if ($(".add-to-favgroup").length === 1) {
// If the user only has one favorite group we don't need to ask which group to add the post to.
$(".add-to-favgroup").click();
@@ -34,18 +27,9 @@ FavoriteGroup.initialize_add_to_favgroup_dialog = function() {
e.preventDefault();
}
Utility.keydown("g", "open_favgroup_dialog", open_favgroup_dialog);
$("#open-favgroup-dialog-link").click(open_favgroup_dialog);
}
FavoriteGroup.add_to_favgroup = function(e) {
var favgroup_index = (e.key === "0") ? "10" : e.key;
var link = $("#add-to-favgroup-" + favgroup_index + ":visible");
if (link.length) {
link.click();
}
}
$(function() {
FavoriteGroup.initialize_all();
});

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

@@ -1,24 +1,8 @@
import Utility from './utility'
let ForumPost = {};
ForumPost.initialize_all = function() {
if ($("#c-forum-topics #a-show,#c-forum-posts #a-show").length) {
this.initialize_edit_links();
Utility.keydown("e", "edit", function(e) {
$(".edit_forum_topic_link")[0].click();
});
Utility.keydown("shift+d", "delete", function(e) {
$("#forum-topic-delete a")[0].click();
});
}
if ($("#c-forum-topics").length) {
Utility.keydown("shift+r", "mark_all_as_read", function(e) {
$("#forum-topic-mark-all-as-read a")[0].click();
});
}
}

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

@@ -806,11 +806,7 @@ let Note = {
},
initialize_shortcuts: function() {
if ($("#note-locked-notice").length === 0) {
$("#translate").click(Note.TranslationMode.toggle);
Utility.keydown("n", "translation_mode", Note.TranslationMode.toggle);
}
$("#translate").click(Note.TranslationMode.toggle);
$("#image").click(Note.Box.toggle_all);
},

26
app/javascript/src/javascripts/paginator.js
View File

@@ -1,26 +0,0 @@
import Utility from './utility'
let Paginator = {};
Paginator.next_page = function() {
var href = $(".paginator a[rel=next]").attr("href");
if (href) {
window.location = href;
}
}
Paginator.prev_page = function() {
var href = $(".paginator a[rel=prev]").attr("href");
if (href) {
window.location = href;
}
}
$(function() {
if ($(".paginator").length) {
Utility.keydown("d right", "next_page", Paginator.next_page);
Utility.keydown("a left", "prev_page", Paginator.prev_page);
}
});
export default Paginator

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

@@ -1,12 +1,6 @@
import Utility from './utility'
let Pool = {};
Pool.initialize_all = function() {
if ($("#c-pools").length) {
this.initialize_shortcuts();
}
if ($("#c-posts").length && $("#a-show").length) {
this.initialize_add_to_pool_link();
}
@@ -30,18 +24,6 @@ Pool.initialize_add_to_pool_link = function() {
});
}
Pool.initialize_shortcuts = function() {
if ($("#c-pools #a-show").length) {
Utility.keydown("e", "edit", function(e) {
$("#pool-edit a")[0].click();
});
Utility.keydown("shift+d", "delete", function(e) {
$("#pool-delete a")[0].click();
});
}
};
Pool.initialize_simple_edit = function() {
$("#sortable").sortable({
placeholder: "ui-state-placeholder"

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

@@ -1,38 +0,0 @@
import Utility from './utility'
let PostPopular = {};
PostPopular.nav_prev = function(e) {
if ($("#popular-nav-links").length) {
var href = $("#popular-nav-links a[rel=prev]").attr("href");
if (href) {
location.href = href;
}
}
e.preventDefault();
}
PostPopular.nav_next = function(e) {
if ($("#popular-nav-links").length) {
var href = $("#popular-nav-links a[rel=next]").attr("href");
if (href) {
location.href = href;
}
}
e.preventDefault();
}
PostPopular.initialize_all = function() {
if ($("#c-explore-posts").length) {
Utility.keydown("a left", "prev_page", PostPopular.nav_prev);
Utility.keydown("d right", "next_page", PostPopular.nav_next);
}
}
$(document).ready(function() {
PostPopular.initialize_all();
});
export default PostPopular

41
app/javascript/src/javascripts/posts.js.erb
View File

@@ -95,6 +95,17 @@ Post.initialize_edit_dialog = function() {
}
Post.open_edit_dialog = function() {
if ($("#edit-dialog").length === 1) {
return;
}
$("#edit").show();
$("#comments").hide();
$("#share").hide();
$("#post-sections li").removeClass("active");
$("#post-edit-link").parent("li").addClass("active");
$("#related-tags-container").show();
var $tag_string = $("#post_tag_string,#upload_tag_string");
$("div.input").has($tag_string).prevAll().hide();
$("#open-edit-dialog").hide();
@@ -230,22 +241,8 @@ Post.swipe_next = function(e) {
Post.initialize_shortcuts = function() {
if ($("#a-show").length) {
Utility.keydown("e", "edit", function(e) {
$("#post-edit-link").trigger("click");
$("#post_tag_string").focus();
e.preventDefault();
});
if (Utility.meta("current-user-can-approve-posts") === "true") {
Utility.keydown("shift+o", "approve", function(e) {
$(".approve-link").click();
});
}
Utility.keydown("a", "prev_page", Post.nav_prev);
Utility.keydown("d", "next_page", Post.nav_next);
Utility.keydown("f", "favorite", Post.favorite);
Utility.keydown("shift+f", "unfavorite", Post.unfavorite);
}
}
@@ -586,22 +583,6 @@ Post.approve = function(post_id) {
});
}
Post.favorite = function (e) {
if ($("#add-to-favorites").is(":visible")) {
$("#add-to-favorites")[0].click();
} else if (Utility.meta("current-user-id") === "") {
$(window).trigger("danbooru:notice", "You must be logged in to favorite posts");
} else {
$(window).trigger("danbooru:notice", "You have already favorited this post");
}
};
Post.unfavorite = function (e) {
$.ajax("/favorites/" + Utility.meta("post-id") + ".js", {
type: "DELETE"
});
};
Post.initialize_saved_searches = function() {
$("#new_saved_search #saved_search_label_string").autocomplete({
search: function() {

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

@@ -1,5 +1,4 @@
import Utility from './utility'
import Post from './posts.js.erb'
let Shortcuts = {};
@@ -7,37 +6,6 @@ Shortcuts.initialize = function() {
Utility.keydown("s", "scroll_down", Shortcuts.nav_scroll_down);
Utility.keydown("w", "scroll_up", Shortcuts.nav_scroll_up);
Shortcuts.initialize_data_shortcuts();
Utility.keydown("q", "focus_search", function(e) {
$("#tags, #search_name, #search_name_matches, #query").trigger("focus").selectEnd();
e.preventDefault();
});
if ($("#image").length) { // post page or bookmarklet upload page
Utility.keydown("shift+e", "edit_dialog", function(e) {
if (Utility.meta("current-user-id") === "") { // anonymous
return;
}
if (!$("#edit-dialog").length) {
$("#edit").show();
$("#comments").hide();
$("#share").hide();
$("#post-sections li").removeClass("active");
$("#post-edit-link").parent("li").addClass("active");
$("#related-tags-container").show();
Post.open_edit_dialog();
}
e.preventDefault();
});
}
if ($("#c-posts #a-index, #c-favorites #a-index").length) {
Utility.keydown("r", "random", function(e) {
$("#random-post")[0].click();
});
}
}
// Bind keyboard shortcuts to links that have a `data-shortcut="..."` attribute. If multiple links have the

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

@@ -1,4 +1,3 @@
import Utility from './utility'
import Post from './posts.js.erb'
import RelatedTag from './related_tag.js.erb'
@@ -18,7 +17,6 @@ Upload.initialize_all = function() {
}
this.initialize_info_bookmarklet();
this.initialize_similar();
this.initialize_shortcuts();
this.initialize_submit();
$("#related-tags-button").trigger("click");
@@ -55,13 +53,6 @@ Upload.initialize_submit = function() {
});
}
Upload.initialize_shortcuts = function() {
Utility.keydown("e", "edit", function(e) {
$("#upload_tag_string").focus();
e.preventDefault();
});
};
Upload.initialize_iqdb_source = function() {
if (/^https?:\/\//.test($("#normalized_url").val())) {
$.get("/iqdb_queries", {"url": $("#normalized_url").val()}).done(function(html) {$("#iqdb-similar").html(html)});

25
app/javascript/src/javascripts/wiki_pages.js
View File

@@ -1,25 +0,0 @@
import Utility from './utility'
let WikiPage = {};
WikiPage.initialize_all = function() {
if ($("#c-wiki-pages,#c-wiki-page-versions").length) {
this.initialize_shortcuts();
}
}
WikiPage.initialize_shortcuts = function() {
if ($("#a-show").length) {
Utility.keydown("e", "edit", function(e) {
$("#wiki-page-edit a")[0].click();
});
Utility.keydown("shift+d", "delete", function(e) {
$("#wiki-page-delete a")[0].click();
});
}
}
$(document).ready(function() {
WikiPage.initialize_all();
});