Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various loading states, remove .loading class #29920

Merged
merged 3 commits into from
Mar 21, 2024
Merged

Fix various loading states, remove .loading class #29920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4840567
Fix various js loading states
silverwind Mar 19, 2024
f5e632c
use tw-py-32 and restore missing gt-hidden
silverwind Mar 20, 2024
75a434a
Merge branch 'main' into js-loading
GiteaBot Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/admin/notice.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</div>
</div>
<button class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="?page={{.Page.Paginater.Current}}">
{{ctx.Locale.Tr "admin.notices.delete_selected"}}
<span class="text">{{ctx.Locale.Tr "admin.notices.delete_selected"}}</span>
silverwind marked this conversation as resolved.
Show resolved Hide resolved
</button>
</th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/graph.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</div>
</h2>
<div class="ui dividing"></div>
<div class="ui segment loading gt-hidden" id="loading-indicator"></div>
<div class="is-loading tw-py-32 gt-hidden" id="loading-indicator"></div>
{{template "repo/graph/svgcontainer" .}}
{{template "repo/graph/commits" .}}
</div>
Expand Down
4 changes: 3 additions & 1 deletion templates/repo/settings/webhook/history.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
<div class="ui right">
<!-- the button is wrapped with a span because the tooltip doesn't show on hover if we put data-tooltip-content directly on the button -->
<span data-tooltip-content="{{if or $isNew .Webhook.IsActive}}{{ctx.Locale.Tr "repo.settings.webhook.test_delivery_desc"}}{{else}}{{ctx.Locale.Tr "repo.settings.webhook.test_delivery_desc_disabled"}}{{end}}">
<button class="ui teal tiny button{{if not (or $isNew .Webhook.IsActive)}} disabled{{end}}" id="test-delivery" data-link="{{.Link}}/test" data-redirect="{{.Link}}">{{ctx.Locale.Tr "repo.settings.webhook.test_delivery"}}</button>
<button class="ui teal tiny button{{if not (or $isNew .Webhook.IsActive)}} disabled{{end}}" id="test-delivery" data-link="{{.Link}}/test" data-redirect="{{.Link}}">
<span class="text">{{ctx.Locale.Tr "repo.settings.webhook.test_delivery"}}</span>
</button>
</span>
</div>
{{end}}
Expand Down
14 changes: 0 additions & 14 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,16 +710,6 @@ img.ui.avatar,
background: var(--color-active);
}

.ui.loading.segment::before,
.ui.loading.form::before {
background: none;
}

.ui.loading.form > *,
.ui.loading.segment > * {
opacity: 0.35;
}

.ui.form .fields.error .field textarea,
.ui.form .fields.error .field select,
.ui.form .fields.error .field input:not([type]),
Expand Down Expand Up @@ -811,10 +801,6 @@ input:-webkit-autofill:active,
opacity: var(--opacity-disabled);
}

.ui.loading.loading.input > i.icon svg {
visibility: hidden;
}

.text.primary {
color: var(--color-primary) !important;
}
Expand Down
6 changes: 0 additions & 6 deletions web_src/css/features/gitgraph.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
min-height: 350px;
}

#git-graph-container > .ui.segment.loading {
border: 0;
z-index: 1;
min-height: 246px;
}

#git-graph-container h2 {
display: flex;
justify-content: space-between;
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/admin/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export function initAdminCommon() {
$('#delete-selection').on('click', async function (e) {
e.preventDefault();
const $this = $(this);
$this.addClass('loading disabled');
$this.addClass('is-loading disabled');
const data = new FormData();
$checkboxes.each(function () {
if ($(this).checkbox('is checked')) {
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/comp/WebHookEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function initCompWebHookEditor() {

// Test delivery
document.getElementById('test-delivery')?.addEventListener('click', async function () {
this.classList.add('loading', 'disabled');
this.classList.add('is-loading', 'disabled');
await POST(this.getAttribute('data-link'));
setTimeout(() => {
window.location.href = this.getAttribute('data-redirect');
Expand Down
10 changes: 6 additions & 4 deletions web_src/js/features/repo-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,33 @@ import {hideElem, showElem} from '../utils/dom.js';
import {POST} from '../modules/fetch.js';

async function getArchive($target, url, first) {
const dropdownBtn = $target[0].closest('.ui.dropdown.button');

try {
dropdownBtn.classList.add('is-loading');
silverwind marked this conversation as resolved.
Show resolved Hide resolved
const response = await POST(url);
if (response.status === 200) {
const data = await response.json();
if (!data) {
// XXX Shouldn't happen?
$target.closest('.dropdown').children('i').removeClass('loading');
dropdownBtn.classList.remove('is-loading');
silverwind marked this conversation as resolved.
Show resolved Hide resolved
return;
}

if (!data.complete) {
$target.closest('.dropdown').children('i').addClass('loading');
// Wait for only three quarters of a second initially, in case it's
// quickly archived.
setTimeout(() => {
getArchive($target, url, false);
}, first ? 750 : 2000);
} else {
// We don't need to continue checking.
$target.closest('.dropdown').children('i').removeClass('loading');
dropdownBtn.classList.remove('is-loading');
window.location.href = url;
}
}
} catch {
$target.closest('.dropdown').children('i').removeClass('loading');
dropdownBtn.classList.remove('is-loading');
}
}

Expand Down
10 changes: 5 additions & 5 deletions web_src/js/features/repo-issue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ export function initRepoIssueTimeTracking() {

async function updateDeadline(deadlineString) {
hideElem($('#deadline-err-invalid-date'));
$('#deadline-loader').addClass('loading');
$('#deadline-loader').addClass('is-loading');

let realDeadline = null;
if (deadlineString !== '') {
const newDate = Date.parse(deadlineString);

if (Number.isNaN(newDate)) {
$('#deadline-loader').removeClass('loading');
$('#deadline-loader').removeClass('is-loading');
showElem($('#deadline-err-invalid-date'));
return false;
}
Expand All @@ -69,7 +69,7 @@ async function updateDeadline(deadlineString) {
}
} catch (error) {
console.error(error);
$('#deadline-loader').removeClass('loading');
$('#deadline-loader').removeClass('is-loading');
showElem($('#deadline-err-invalid-date'));
}
}
Expand Down Expand Up @@ -237,14 +237,14 @@ export function initRepoPullRequestUpdate() {
e.preventDefault();
const $this = $(this);
const redirect = $this.data('redirect');
$this.addClass('loading');
$this.addClass('is-loading');
let response;
try {
response = await POST($this.data('do'));
} catch (error) {
console.error(error);
} finally {
$this.removeClass('loading');
$this.removeClass('is-loading');
}
let data;
try {
Expand Down