Skip to content

Commit e08ee39

Browse files
committed
Fix various js loading states
1 parent fa10061 commit e08ee39

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

templates/admin/notice.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</div>
5151
</div>
5252
<button class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="{{.Link}}?page={{.Page.Paginater.Current}}">
53-
{{ctx.Locale.Tr "admin.notices.delete_selected"}}
53+
<span class="text">{{ctx.Locale.Tr "admin.notices.delete_selected"}}</span>
5454
</button>
5555
</th>
5656
</tr>

web_src/js/features/admin/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export function initAdminCommon() {
208208
$('#delete-selection').on('click', async function (e) {
209209
e.preventDefault();
210210
const $this = $(this);
211-
$this.addClass('loading disabled');
211+
$this.addClass('is-loading disabled');
212212
const data = new FormData();
213213
$checkboxes.each(function () {
214214
if ($(this).checkbox('is checked')) {

web_src/js/features/repo-common.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,33 @@ import {hideElem, showElem} from '../utils/dom.js';
33
import {POST} from '../modules/fetch.js';
44

55
async function getArchive($target, url, first) {
6+
const dropdownBtn = $target[0].closest('.ui.dropdown.button');
7+
68
try {
9+
dropdownBtn.classList.add('is-loading');
710
const response = await POST(url);
811
if (response.status === 200) {
912
const data = await response.json();
1013
if (!data) {
1114
// XXX Shouldn't happen?
12-
$target.closest('.dropdown').children('i').removeClass('loading');
15+
dropdownBtn.classList.remove('is-loading');
1316
return;
1417
}
1518

1619
if (!data.complete) {
17-
$target.closest('.dropdown').children('i').addClass('loading');
1820
// Wait for only three quarters of a second initially, in case it's
1921
// quickly archived.
2022
setTimeout(() => {
2123
getArchive($target, url, false);
2224
}, first ? 750 : 2000);
2325
} else {
2426
// We don't need to continue checking.
25-
$target.closest('.dropdown').children('i').removeClass('loading');
27+
dropdownBtn.classList.remove('is-loading');
2628
window.location.href = url;
2729
}
2830
}
2931
} catch {
30-
$target.closest('.dropdown').children('i').removeClass('loading');
32+
dropdownBtn.classList.remove('is-loading');
3133
}
3234
}
3335

web_src/js/features/repo-issue.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ export function initRepoIssueTimeTracking() {
4343

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

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

5252
if (Number.isNaN(newDate)) {
53-
$('#deadline-loader').removeClass('loading');
53+
$('#deadline-loader').removeClass('is-loading');
5454
showElem($('#deadline-err-invalid-date'));
5555
return false;
5656
}
@@ -69,7 +69,7 @@ async function updateDeadline(deadlineString) {
6969
}
7070
} catch (error) {
7171
console.error(error);
72-
$('#deadline-loader').removeClass('loading');
72+
$('#deadline-loader').removeClass('is-loading');
7373
showElem($('#deadline-err-invalid-date'));
7474
}
7575
}
@@ -231,14 +231,14 @@ export function initRepoPullRequestUpdate() {
231231
e.preventDefault();
232232
const $this = $(this);
233233
const redirect = $this.data('redirect');
234-
$this.addClass('loading');
234+
$this.addClass('is-loading');
235235
let response;
236236
try {
237237
response = await POST($this.data('do'));
238238
} catch (error) {
239239
console.error(error);
240240
} finally {
241-
$this.removeClass('loading');
241+
$this.removeClass('is-loading');
242242
}
243243
let data;
244244
try {

0 commit comments

Comments
 (0)