Merge branch 'rails-5.1'

This commit is contained in:
Albert Yi
2018-04-11 11:40:36 -07:00
361 changed files with 4795 additions and 4798 deletions

View File

@@ -56,23 +56,17 @@
}
Danbooru.ModQueue.detailed_rejection_dialog = function() {
$("#post_id").val($(this).data("post-id"));
$("#post_disapproval_post_id").val($(this).data("post-id"));
$("#detailed-rejection-dialog").dialog({
width: 500,
buttons: {
"Submit": function() {
var data = $("#detailed-rejection-form").serialize();
$.ajax({
type: "POST",
url: $("#detailed-rejection-form").attr("action"),
data: data,
dataType: "script"
});
$("#detailed-rejection-dialog").dialog("close");
$(this).find("form").submit();
$(this).dialog("close");
},
"Cancel": function() {
$("#detailed-rejection-dialog").dialog("close");
$(this).dialog("close");
}
}
});

View File

@@ -628,6 +628,8 @@
});
$("#save-search").click(function(e) {
$("#save-search-dialog #saved_search_query").val($("#tags").val());
if (Danbooru.meta("disable-labeled-saved-searches") === "false") {
$("#save-search-dialog").dialog("open");
} else {