Save this flash (right click and save)
'; else if (post.file_ext === "webm") // Create webm video - imgContainer.innerHTML = 'Save this video (right click and save)
'; + imgContainer.innerHTML = 'Save this video (right click and save)
'; else if (post.file_ext === "zip" && /\bugoira\b/.test(post.tag_string)) { // Create ugoira - imgContainer.innerHTML = 'Loaded 0%
Save this video (right click and save) | View original | Toggle notes
'; + + // Prep the "toggle notes" link. + noteToggleLinkInit(); + } + else { // Load original ugoira version. + imgContainer.innerHTML = 'Loaded 0%
Save as video (right click and save) | View sample | Toggle notes
Save this file (right click and save)
'; @@ -1017,74 +1048,55 @@ function bbbScript() { // This is needed to make this script work in Chrome. if (!alternate_image_swap) // Make notes toggle when clicking the image. noteToggleInit(); - else { // Make sample/original images swap when clicking the image. - // Make a "Toggle Notes" link in the options bar. - if (!document.getElementById("listnotetoggle")) { // For logged in users. - var translateOption = document.getElementById("add-notes-list"); - var listNoteToggle = document.createElement("li"); - - if (translateOption) { - listNoteToggle.innerHTML = 'Toggle notes'; - translateOption.parentNode.insertBefore(listNoteToggle, translateOption); - } - } - - document.getElementById("listnotetoggle").addEventListener("click", function(event) { - Danbooru.Note.Box.toggle_all(); - event.preventDefault(); - }, false); - - // Make clicking the image swap between the original and sample image when available. - if (post.has_large) { - document.addEventListener("click", function(event) { - if (event.target.id === "image" && event.button === 0 && !bbb.post.translationMode) { - if (!bbb.dragscroll.moved) - swapImage(); - - event.stopPropagation(); - } - }, true); - } - } + else // Make sample/original images swap when clicking the image. + alternateImageSwap(post); } // Enable drag scrolling. if (image_drag_scroll) dragScrollInit(); - // Make translation mode work. - if (!document.getElementById("note-locked-notice")) { - var translateLink = document.getElementById("translate"); + // Resize the content if desired. + if (checkSetting("always-resize-images", "true", image_resize)) + resizeImage(image_resize_mode); - // Make the normal toggling work for hidden posts. - if (post.is_hidden) { - if (translateLink) - translateLink.addEventListener("click", Danbooru.Note.TranslationMode.toggle, false); + if (post.file_ext !== "webm") { // Don't allow note functions on webm videos. + if (document.getElementById("image").tagName !== "VIDEO") { // Make translation mode work on non-video content. + if (isLoggedIn() && !document.getElementById("note-locked-notice")) { + var translateLink = document.getElementById("translate"); - document.addEventListener("keydown", function(event) { - if (event.keyCode === 78 && document.activeElement.type !== "text" && document.activeElement.type !== "textarea") - Danbooru.Note.TranslationMode.toggle(event); - }, false); - } + // Make the normal toggling work for hidden posts. + if (post.is_hidden) { + if (translateLink) + translateLink.addEventListener("click", Danbooru.Note.TranslationMode.toggle, false); - // Script translation mode events and tracking used to resolve timing issues. - bbb.post.translationMode = Danbooru.Note.TranslationMode.active; + document.addEventListener("keydown", function(event) { + if (event.keyCode === 78 && document.activeElement.type !== "text" && document.activeElement.type !== "textarea") + Danbooru.Note.TranslationMode.toggle(event); + }, false); + } - if (translateLink) - translateLink.addEventListener("click", translationModeToggle, false); + // Script translation mode events and tracking used to resolve timing issues. + bbb.post.translationMode = Danbooru.Note.TranslationMode.active; - document.addEventListener("keydown", function(event) { - if (event.keyCode === 78 && document.activeElement.type !== "text" && document.activeElement.type !== "textarea") - translationModeToggle(); - }, false); - } + if (translateLink) + translateLink.addEventListener("click", translationModeToggle, false); - // Resize the content if desired. - if (checkSetting("always-resize-images", "true", image_resize)) - resizeImage(image_resize_mode); + document.addEventListener("keydown", function(event) { + if (event.keyCode === 78 && document.activeElement.type !== "text" && document.activeElement.type !== "textarea") + translationModeToggle(); + }, false); + } + } + else { // Allow note viewing on ugoira webm video samples, but don't allow editing. + Danbooru.Note.Edit.show = function() { + danbNotice('Better Better Booru: Note editing is not allowed while using the webm video sample. Please use the original ugoira version for note editing.', "error"); + }; + } - // Load/reload notes. - Danbooru.Note.load_all(); + // Load/reload notes. + Danbooru.Note.load_all(); + } // Auto position the content if desired. if (autoscroll_image) @@ -2343,11 +2355,12 @@ function bbbScript() { // This is needed to make this script work in Chrome. var scrollDivDiff = menu.offsetHeight - scrollDiv.clientHeight; scrollDiv.style.maxHeight = viewHeight - scrollDiv.bbbGetPadding().height - scrollDivDiff - 50 + "px"; // Subtract 50 for margins (25 each). + bbb.timers.adjustMenu = 0; } function adjustMenuTimer() { - if (!adjustMenuTimeout && bbb.el.menu.window) - var adjustMenuTimeout = window.setTimeout(function() { adjustMenuHeight(); }, 50); + if (!bbb.timers.adjustMenu && bbb.el.menu.window) + bbb.timers.adjustMenu = window.setTimeout(adjustMenuHeight, 50); } function removeMenu() { @@ -2482,6 +2495,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. case "6.3": case "6.3.1": case "6.3.2": + case "6.4": break; } @@ -2714,15 +2728,17 @@ function bbbScript() { // This is needed to make this script work in Chrome. function resizeImage(mode) { // Custom resize post script. var imgContainer = document.getElementById("image-container"); + var contentDiv = document.getElementById("content"); var img = document.getElementById("image"); var swfObj = (imgContainer ? imgContainer.getElementsByTagName("object")[0] : undefined); var swfEmb = (swfObj ? swfObj.getElementsByTagName("embed")[0] : undefined); var webmVid = (imgContainer ? imgContainer.getElementsByTagName("video")[0] : undefined); + var ugoira = (imgContainer ? imgContainer.getElementsByTagName("canvas")[0] : undefined); var ugoiraPanel = document.getElementById("ugoira-control-panel"); var ugoiraSlider = document.getElementById("seek-slider"); - var target = img || swfEmb || webmVid; + var target = img || swfEmb || webmVid || ugoira; - if (!target || !imgContainer) + if (!target || !imgContainer || !contentDiv) return; var currentMode = bbb.post.resize.mode; @@ -2730,10 +2746,10 @@ function bbbScript() { // This is needed to make this script work in Chrome. var resizeLinkAll = bbb.el.resizeLinkAll; var resizeLinkWidth = bbb.el.resizeLinkWidth; var resizeLinkHeight = bbb.el.resizeLinkHeight; - var availableWidth = imgContainer.clientWidth; + var availableWidth = imgContainer.clientWidth || contentDiv.clientWidth - contentDiv.bbbGetPadding().width; var availableHeight = window.innerHeight - 40; - var targetCurrentWidth = target.clientWidth; - var targetCurrentHeight = target.clientHeight; + var targetCurrentWidth = target.clientWidth || parseFloat(target.style.width) || target.getAttribute("width"); + var targetCurrentHeight = target.clientHeight || parseFloat(target.style.height) || target.getAttribute("height"); var targetWidth = (swfEmb || webmVid ? imgContainer.getAttribute("data-width") : img.getAttribute("width")); // Was NOT expecting target.width to return the current width (css style width) and not the width attribute's value here... var targetHeight = (swfEmb || webmVid ? imgContainer.getAttribute("data-height") : img.getAttribute("height")); var tooWide = targetCurrentWidth > availableWidth; @@ -2773,9 +2789,9 @@ function bbbScript() { // This is needed to make this script work in Chrome. if (switchMode) { if (currentRatio !== ratio || mode === "swap") { - if (img) { // Handle regular images and ugoira animations. - img.style.width = targetWidth * ratio + "px"; - img.style.height = targetHeight * ratio + "px"; + if (img || ugoira) { + target.style.width = targetWidth * ratio + "px"; + target.style.height = targetHeight * ratio + "px"; if (ugoiraPanel && ugoiraSlider) { ugoiraPanel.style.width = targetWidth * ratio + "px"; @@ -2812,7 +2828,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. var swapLink = bbb.el.swapLink; var ratio = (post.image_width > 850 ? 850 / post.image_width : 1); - if (!post.has_large) + if (!post.has_large || (post.file_ext === "zip" && /\bugoira\b/.test(post.tag_string))) return; if (bbbLoader.src !== "about:blank") { @@ -2952,7 +2968,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. link = links[i]; linkHref = link.getAttribute("href"); // Use getAttribute so that we get the exact value. "link.href" adds in the domain. - if (linkHref && linkHref.indexOf("/posts?") === 0 && !/(?:page|limit)=/.test(linkHref)) + if (linkHref && !/(?:page|limit)=/.test(linkHref) && (linkHref.indexOf("/posts?") === 0 || linkHref.indexOf("/favorites?") === 0)) link.href = linkHref + "&limit=" + thumbnail_count; } } @@ -2964,17 +2980,13 @@ function bbbScript() { // This is needed to make this script work in Chrome. link = links[i]; linkHref = link.getAttribute("href"); - if (linkHref && (linkHref.indexOf("/posts") === 0 || linkHref === "/" || linkHref ==="/notes?group_by=post")) { - if (linkHref.indexOf("?") > -1) - link.href = linkHref + "&limit=" + thumbnail_count; - else - link.href = linkHref + "?limit=" + thumbnail_count; - } + if (linkHref && (linkHref.indexOf("/posts") === 0 || linkHref === "/" || linkHref ==="/notes?group_by=post" || linkHref === "/favorites")) + link.href = updateUrlQuery(linkHref, "limit=" + thumbnail_count); } } // Fix the search. - if (searchParent && (gLoc === "search" || gLoc === "post" || gLoc === "intro")) { + if (searchParent && (gLoc === "search" || gLoc === "post" || gLoc === "intro" || gLoc === "favorites")) { search = searchParent.getElementsByTagName("form")[0]; if (search) { @@ -2984,6 +2996,9 @@ function bbbScript() { // This is needed to make this script work in Chrome. limitInput.type = "hidden"; search.appendChild(limitInput); + // Change the form action if on the favorites page. It uses "/favorites", but that just goes to the normal "/posts" search while stripping out the limit. + search.action = "/posts"; + // Remove the user's default limit if the user tries to specify a limit value in the tags. tagsInput = document.getElementById("tags"); @@ -3084,7 +3099,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. targetContainer = document.getElementById("a-show"); targetContainer = (targetContainer ? targetContainer.getElementsByTagName("section")[0] : undefined); } - else if (gLoc === "search") + else if (gLoc === "search" || gLoc === "favorites") targetContainer = document.getElementById("posts"); else if (gLoc === "intro") targetContainer = document.getElementById("a-intro"); @@ -3147,7 +3162,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. return "post"; else if (/^\/(?:posts|$)/.test(gUrlPath)) return "search"; - else if (gUrlPath.indexOf("/notes") === 0 && gUrlQuery.indexOf("group_by=note") < 0) + else if (/^\/notes\/?$/.test(gUrlPath) && gUrlQuery.indexOf("group_by=note") < 0) return "notes"; else if (/^\/comments\/?$/.test(gUrlPath) && gUrlQuery.indexOf("group_by=comment") < 0) return "comments"; @@ -3155,6 +3170,8 @@ function bbbScript() { // This is needed to make this script work in Chrome. return "popular"; else if (/\/pools\/\d+/.test(gUrlPath)) return "pool"; + else if (gUrlPath.indexOf("/favorites") === 0) + return "favorites"; else if (gUrlPath.indexOf("/uploads/new") === 0) return "upload"; else if (gUrlPath.indexOf("/pools/new") === 0) @@ -3200,7 +3217,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. var page = getVar("page"); var result = false; - if (gLoc === "search") { + if (gLoc === "search" || gLoc === "favorites") { if (limit === 0 || page === "b1" || limitTag === 0) result = true; } @@ -3673,7 +3690,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. '#notice {padding-right: 55px !important;}'; // Fix Danbooru notice overlapping text for long messages. // Provide a little extra space for listings that allow thumbnail_count. - if (thumbnail_count && (gLoc === "search" || gLoc === "notes")) { + if (thumbnail_count && (gLoc === "search" || gLoc === "notes" || gLoc === "favorites")) { styles += 'div#page {margin: 0px 10px 0px 20px !important;}' + 'section#content {padding: 0px !important;}'; } @@ -3864,21 +3881,20 @@ function bbbScript() { // This is needed to make this script work in Chrome. function postDDL(target) { // Add direct downloads to thumbnails. - if (gLoc !== "search" && gLoc !== "pool" && gLoc !== "popular") + if (gLoc !== "search" && gLoc !== "pool" && gLoc !== "popular" && gLoc !== "favorites") return; var posts = getPosts(target); - var post; - var postId; - var postUrl; - var ddlLink; for (var i = 0, il = posts.length; i < il; i++) { - post = posts[i]; - postUrl = post.getAttribute("data-file-url"); - postId = post.getAttribute("data-id"); + var post = posts[i]; + var postOrigUrl = post.getAttribute("data-file-url") || ""; + var postSampUrl = post.getAttribute("data-large-file-url") || ""; + var postUrl = (postSampUrl.indexOf(".webm") > -1 ? postSampUrl : postOrigUrl); + var postId = post.getAttribute("data-id"); + var ddlLink = post.getElementsByClassName("bbb-ddl")[0]; - if (!post.getElementsByClassName("bbb-ddl").length) { + if (!ddlLink) { // If the direct download doesn't already exist, create it. ddlLink = document.createElement("a"); ddlLink.innerHTML = "Direct Download"; ddlLink.href = postUrl || "DDL unavailable for post " + postId + ".jpg"; @@ -3886,6 +3902,8 @@ function bbbScript() { // This is needed to make this script work in Chrome. ddlLink.className = "bbb-ddl"; post.appendChild(ddlLink); } + else if (ddlLink.href.indexOf("/data/") < 0) // Fix existing links for hidden thumbs. + ddlLink.href = postUrl || "DDL unavailable for post " + postId + ".jpg"; } } @@ -3993,7 +4011,6 @@ function bbbScript() { // This is needed to make this script work in Chrome. var infoSection = document.getElementById("post-information"); var infoListItems = (infoSection ? infoSection.getElementsByTagName("li") : null); - var infoListItem; var statusListItem; var newStatusContent; var flaggedNotice = document.getElementsByClassName("notice-flagged")[0]; @@ -4007,7 +4024,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. if (infoListItems) { // Locate the status portion of the information section. for (i = infoListItems.length - 1; i >= 0; i--) { - infoListItem = infoListItems[i]; + var infoListItem = infoListItems[i]; if (infoListItem.textContent.indexOf("Status:") > -1) { statusListItem = infoListItem; @@ -4065,24 +4082,24 @@ function bbbScript() { // This is needed to make this script work in Chrome. var bannedLink = document.getElementById("bbb-banned-link"); if (flaggedLink) - statusLinkEvents(flaggedLink, flaggedNotice, "flaggedTimer"); + statusLinkEvents(flaggedLink, flaggedNotice); if (appealedLink) - statusLinkEvents(appealedLink, appealedNotice, "appealedTimer"); + statusLinkEvents(appealedLink, appealedNotice); if (pendingLink) - statusLinkEvents(pendingLink, pendingNotice, "pendingTimer"); + statusLinkEvents(pendingLink, pendingNotice); if (deletedLink) - statusLinkEvents(deletedLink, deletedNotice, "deletedTimer"); + statusLinkEvents(deletedLink, deletedNotice); if (bannedLink) - statusLinkEvents(bannedLink, bannedNotice, "bannedTimer"); + statusLinkEvents(bannedLink, bannedNotice); } } - function statusLinkEvents(link, notice, timer) { + function statusLinkEvents(link, notice) { // Attach events to the status links to enable a tooltip style notice. - link.addEventListener("click", function(event) {showStatusNotice(event, notice);}, false); - link.addEventListener("mouseout", function() {bbb[timer] = window.setTimeout(function() { notice.style.display = "none";}, 200);}, false); - notice.addEventListener("mouseover", function() {window.clearTimeout(bbb[timer]);}, false); - notice.addEventListener("mouseleave", function() {notice.style.display = "none";}, false); + link.addEventListener("click", function(event) { showStatusNotice(event, notice); }, false); + link.addEventListener("mouseout", function() { bbb.timers.minNotice = window.setTimeout(function() { notice.style.display = "none"; }, 200); }, false); + notice.addEventListener("mouseover", function() { window.clearTimeout(bbb.timers.minNotice); }, false); + notice.addEventListener("mouseleave", function() { notice.style.display = "none"; }, false); } function showStatusNotice(event, noticeEl) { @@ -4162,18 +4179,19 @@ function bbbScript() { // This is needed to make this script work in Chrome. return false; var tags = post.getAttribute("data-tags"); - var user = " user:" + post.getAttribute("data-uploader").replace(/\s/g, "_").toLowerCase(); + var flags = post.getAttribute("data-flags") || "active"; var rating = " rating:" + post.getAttribute("data-rating"); + var status = " status:" + (flags === "flagged" ? flags + " active" : flags).replace(/\s/g, " status:"); + var user = " user:" + post.getAttribute("data-uploader").replace(/\s/g, "_").toLowerCase(); var pools = " " + post.getAttribute("data-pools"); var score = post.getAttribute("data-score"); var favcount = post.getAttribute("data-fav-count"); var id = post.getAttribute("data-id"); var width = post.getAttribute("data-width"); var height = post.getAttribute("data-height"); - var flags = post.getAttribute("data-flags") || "active"; - var status = " status:" + (flags === "flagged" ? flags + " active" : flags).replace(/\s/g, " status:"); var postInfo = { - tags: (tags + rating + status + user + pools).bbbSpacePad(), + tags: tags.bbbSpacePad(), + metatags:(rating + status + user + pools).bbbSpacePad(), score: Number(score), favcount: Number(favcount), id: Number(id), @@ -4264,14 +4282,22 @@ function bbbScript() { // This is needed to make this script work in Chrome. function thumbTagMatch(postInfo, tag) { // Test thumbnail info for a tag match. + var targetTags; + if (typeof(tag) === "string") { // Check regular tags and metatags with string values. - if (postInfo.tags.indexOf(tag) > -1) + targetTags = (isMetatag(tag) ? postInfo.metatags : postInfo.tags); + + if (targetTags.indexOf(tag) > -1) return true; else return false; } else if (tag instanceof RegExp) { // Check wildcard tags. - return tag.test(postInfo.tags); + var stringTag = String(tag); // Convert regex to a string and... + stringTag = stringTag.substring(2, stringTag.length - 2); // ...remove the leading "/ " and trailing " /" before passing it for testing. + targetTags = (isMetatag(stringTag) ? postInfo.metatags : postInfo.tags); + + return tag.test(targetTags); } else if (typeof(tag) === "object") { // Check numeric metatags. var tagsMetaValue = postInfo[tag.tagName]; @@ -4328,11 +4354,11 @@ function bbbScript() { // This is needed to make this script work in Chrome. searchTerm = searchTerm.slice(1); } - if (searchTerm.length > 0) - mode = searchObject[primaryMode][secondaryMode]; - else + if (searchTerm.length < 1) // Stop if there is no actual tag. continue; + mode = searchObject[primaryMode][secondaryMode]; + if (isNumMetatag(searchTerm)) { // Parse numeric metatags and turn them into objects. var tagArray = searchTerm.split(":"); var metaObject = { @@ -4387,7 +4413,7 @@ function bbbScript() { // This is needed to make this script work in Chrome. mode.push(metaObject); } } - else if (numSearch.indexOf("..") > -1) { // Greater than or equal to and less than or equal to range. tag:#..# + else if (numSearch.indexOf("..") > -1) { // Greater than or equal to and less than or equal to range. (tag:#..#) numArray = numSearch.split(".."); greater = parseInt(numArray[0], 10); less = parseInt(numArray[1], 10); @@ -4437,6 +4463,20 @@ function bbbScript() { // This is needed to make this script work in Chrome. } } + function isMetatag(tag) { + // Check if the tag from a search string is a metatag. + if (tag.indexOf(":") < 0) + return false; + else { + var tagName = tag.split(":", 1)[0].bbbSpaceClean(); + + if (tagName === "pool" || tagName === "user" || tagName === "status" || tagName === "rating") + return true; + else + return false; + } + } + function delayMe(func) { // Run the function after the browser has finished its current stack of tasks. window.setTimeout(func, 0); @@ -4446,6 +4486,47 @@ function bbbScript() { // This is needed to make this script work in Chrome. return regEx.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); } + function updateUrlQuery(url) { + // Add information to the query portion of a full url. + var urlParts = url.split(/[?#]/g, 2); + var urlQuery = urlParts[1] || ""; + var queries = urlQuery.split("&"); + var query; + var queryName; + var queryValue; + var queryObj = {}; + var i, il; // Loop variables. + + for (i = 0, il = queries.length; i < il; i++) { + query = queries[i].split("="); + queryName = query[0]; + queryValue = query[1]; + + if (queryName) + queryObj[queryName] = queryValue; + } + + for (i = 1, il = arguments.length; i < il; i++) { + query = arguments[i].split("="); + queryName = query[0]; + queryValue = query[1]; + + if (queryName) + queryObj[queryName] = queryValue; + } + + queries.length = 0; + + for (i in queryObj) { + if (queryObj.hasOwnProperty(i)) + queries.push(i + "=" + queryObj[i]); + } + + urlQuery = queries.join("&"); + + return urlParts[0] + "?" + urlQuery; + } + function bbbStatusInit() { // Insert the status message container and prep the request tracking. var statusDiv = document.createElement("div"); @@ -4633,6 +4714,46 @@ function bbbScript() { // This is needed to make this script work in Chrome. }, true); } + function noteToggleLinkInit() { + // Make a "toggle notes" link in the sidebar options or prepare an existing link. + var toggleLink = document.getElementById("bbb-note-toggle"); + + if (!toggleLink) { + var before = document.getElementById((isLoggedIn() ? "add-notes-list" : "random-post")); + + if (before) { + var listNoteToggle = document.createElement("li"); + listNoteToggle.innerHTML = 'Toggle notes'; + before.parentNode.insertBefore(listNoteToggle, before); + toggleLink = document.getElementById("bbb-note-toggle"); + } + } + + if (toggleLink) { + document.getElementById("bbb-note-toggle").addEventListener("click", function(event) { + Danbooru.Note.Box.toggle_all(); + event.preventDefault(); + }, false); + } + } + + function alternateImageSwap(post) { + // Override Danbooru's image click handler for toggling notes with a custom one that swaps the image. + if (post.has_large) { + document.addEventListener("click", function(event) { + if (event.target.id === "image" && event.button === 0 && !bbb.post.translation_mode) { + if (!bbb.drag_scroll.moved) + swapImage(); + + event.stopPropagation(); + } + }, true); + } + + // Set up the "toggle notes" link since the image won't be used for toggling. + noteToggleLinkInit(); + } + function trackNew() { var header = document.getElementById("top"); diff --git a/changelog.md b/changelog.md index 800d0d8..9489dc5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,13 @@ Changelog ---------- +* Version 6.5: + * Added support for the favorites listing. + * Updated to support Danbooru's ugoira changes with added support for note viewing on the sample webm versions and an additional "view sample" link for switching from the original ugoira versions. + * Fixed a potential problem with thumbnails where the "tags" query value would end up set as "undefined". + * Fixed the random post hotkey for logged out users. + * Fixed an issue with wildcards and metatags for thumbnail matching rules. + * Fixed the detection of the notes search as a notes listing. + * Fixed post resizing for hidden blacklisted posts. * Version 6.4: * Updated to support "ugoira" animation posts in their native format. * Version 6.3.2: