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

Merge pull request #4560 from BrokenEagle/fix-tooltip-initialize

Browse Source 
Fix tooltips to allow for reinitialization
This commit is contained in:
evazion
2020-08-07 10:02:32 -05:00
committed by GitHub
parent f2e262d5fd 0bf5ac7374
commit ad2ad295af
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ PostTooltip.initialize = function () {
delegate("body", { delegate("body", {
allowHTML: true, allowHTML: true,
appendTo: document.body, appendTo: document.querySelector("#post-tooltips"),
delay: [PostTooltip.SHOW_DELAY, PostTooltip.HIDE_DELAY], delay: [PostTooltip.SHOW_DELAY, PostTooltip.HIDE_DELAY],
duration: PostTooltip.DURATION, duration: PostTooltip.DURATION,
interactive: true, interactive: true,

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

@@ -11,9 +11,9 @@ UserTooltip.DURATION = 250;
UserTooltip.MAX_WIDTH = 600; UserTooltip.MAX_WIDTH = 600;
UserTooltip.initialize = function () { UserTooltip.initialize = function () {
delegate("body", { delegate("#page", {
allowHTML: true, allowHTML: true,
appendTo: document.body, appendTo: document.querySelector("#user-tooltips"),
delay: [UserTooltip.SHOW_DELAY, UserTooltip.HIDE_DELAY], delay: [UserTooltip.SHOW_DELAY, UserTooltip.HIDE_DELAY],
duration: UserTooltip.DURATION, duration: UserTooltip.DURATION,
interactive: true, interactive: true,
@@ -26,7 +26,7 @@ UserTooltip.initialize = function () {
onHide: UserTooltip.on_hide, onHide: UserTooltip.on_hide,
}); });
delegate("body", { delegate("#user-tooltips", {
allowHTML: true, allowHTML: true,
interactive: true, interactive: true,
theme: "common-tooltip", theme: "common-tooltip",

5
app/views/layouts/default.html.erb
View File

@@ -90,6 +90,11 @@
<%= yield :layout %> <%= yield :layout %>
</div> </div>
<div id="tooltips">
<div id="post-tooltips"></div>
<div id="user-tooltips"></div>
</div>
<script type="application/javascript"> <script type="application/javascript">
if (typeof window.Danbooru !== "object") { if (typeof window.Danbooru !== "object") {
window.Danbooru = {}; window.Danbooru = {};