Skip to content

Commit 2b86075

Browse files
Gusteddineshsalunke
Gusted
authored andcommitted
Init popup for new code comment (go-gitea#20234)
- Initialize the popup for the tooltip inside the new code comment. - This works and is good enough to have this issue fixed for 1.17 Fix go-gitea#20068
1 parent 1890c80 commit 2b86075

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

web_src/js/features/common-global.js

+14-9
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,20 @@ export function initGlobalButtonClickOnEnter() {
7575
});
7676
}
7777

78+
export function initPopup(target) {
79+
const $el = $(target);
80+
const attr = $el.attr('data-variation');
81+
const attrs = attr ? attr.split(' ') : [];
82+
const variations = new Set([...attrs, 'inverted', 'tiny']);
83+
$el.attr('data-variation', [...variations].join(' ')).popup();
84+
}
85+
86+
export function initGlobalPopups() {
87+
$('.tooltip').each((_, el) => {
88+
initPopup(el);
89+
});
90+
}
91+
7892
export function initGlobalCommon() {
7993
// Show exact time
8094
$('.time-since').each(function () {
@@ -121,15 +135,6 @@ export function initGlobalCommon() {
121135

122136
$('.ui.checkbox').checkbox();
123137

124-
// init popups
125-
$('.tooltip').each((_, el) => {
126-
const $el = $(el);
127-
const attr = $el.attr('data-variation');
128-
const attrs = attr ? attr.split(' ') : [];
129-
const variations = new Set([...attrs, 'inverted', 'tiny']);
130-
$el.attr('data-variation', [...variations].join(' ')).popup();
131-
});
132-
133138
$('.top.menu .tooltip').popup({
134139
onShow() {
135140
if ($('.top.menu .menu.transition').hasClass('visible')) {

web_src/js/features/repo-diff.js

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {initCompReactionSelector} from './comp/ReactionSelector.js';
33
import {initRepoIssueContentHistory} from './repo-issue-content.js';
44
import {validateTextareaNonEmpty} from './comp/EasyMDE.js';
55
import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles} from './pull-view-file.js';
6+
import {initPopup} from './common-global.js';
67

78
const {csrfToken} = window.config;
89

@@ -52,6 +53,7 @@ export function initRepoDiffConversationForm() {
5253
const newConversationHolder = $(await $.post(form.attr('action'), form.serialize()));
5354
const {path, side, idx} = newConversationHolder.data();
5455

56+
initPopup(newConversationHolder.find('.tooltip'));
5557
form.closest('.conversation-holder').replaceWith(newConversationHolder);
5658
if (form.closest('tr').data('line-type') === 'same') {
5759
$(`[data-path="${path}"] a.add-code-comment[data-idx="${idx}"]`).addClass('invisible');

web_src/js/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import {
5656
initGlobalFormDirtyLeaveConfirm,
5757
initGlobalLinkActions,
5858
initHeadNavbarContentToggle,
59+
initGlobalPopups,
5960
} from './features/common-global.js';
6061
import {initRepoTopicBar} from './features/repo-home.js';
6162
import {initAdminEmails} from './features/admin-emails.js';
@@ -99,6 +100,7 @@ initVueEnv();
99100
$(document).ready(() => {
100101
initGlobalCommon();
101102

103+
initGlobalPopups();
102104
initGlobalButtonClickOnEnter();
103105
initGlobalButtons();
104106
initGlobalCopyToClipboardListener();

0 commit comments

Comments
 (0)