Skip to content

Commit 1a811c0

Browse files
authored
Refactor image diff (#31444)
And remove some jQuery functions
1 parent b3ed1e0 commit 1a811c0

File tree

6 files changed

+193
-169
lines changed

6 files changed

+193
-169
lines changed

Diff for: templates/repo/diff/image_diff.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
data-mime-before="{{.sniffedTypeBase.GetMimeType}}"
88
data-mime-after="{{.sniffedTypeHead.GetMimeType}}"
99
>
10-
<overflow-menu class="ui secondary pointing tabular top attached borderless menu">
10+
<overflow-menu class="ui secondary pointing tabular menu custom">
1111
<div class="overflow-menu-items tw-justify-center">
1212
<a class="item active" data-tab="diff-side-by-side-{{.file.Index}}">{{ctx.Locale.Tr "repo.diff.image.side_by_side"}}</a>
1313
{{if and .blobBase .blobHead}}

Diff for: web_src/js/features/common-form.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import $ from 'jquery';
2+
import {initAreYouSure} from '../vendor/jquery.are-you-sure.js';
23
import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
34

45
export function initGlobalFormDirtyLeaveConfirm() {
6+
initAreYouSure(window.jQuery);
57
// Warn users that try to leave a page after entering data into a form.
68
// Except on sign-in pages, and for forms marked as 'ignore-dirty'.
79
if (!$('.user.signin').length) {

Diff for: web_src/js/features/common-page.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export function initFootLanguageMenu() {
2626
$('.language-menu a[lang]').on('click', linkLanguageAction);
2727
}
2828

29-
export function initGlobalComponents() {
29+
export function initGlobalDropdown() {
3030
// Semantic UI modules.
3131
const $uiDropdowns = $('.ui.dropdown');
3232

@@ -68,8 +68,10 @@ export function initGlobalComponents() {
6868
// eg: the "Create New Repo" menu on the navbar.
6969
$uiDropdowns.filter('.upward').dropdown('setting', 'direction', 'upward');
7070
$uiDropdowns.filter('.downward').dropdown('setting', 'direction', 'downward');
71+
}
7172

72-
$('.ui.menu.tabular .item').tab({autoTabActivation: false});
73+
export function initGlobalTabularMenu() {
74+
$('.ui.menu.tabular:not(.custom) .item').tab({autoTabActivation: false});
7375
}
7476

7577
/**

0 commit comments

Comments
 (0)