summaryrefslogtreecommitdiffstats
path: root/web_src/js
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2023-08-25 18:03:14 +0200
committerGitHub <noreply@github.com>2023-08-25 16:03:14 +0000
commit8b5c081d766bc7be725b07a8abfb2d8f39c45fd3 (patch)
treeef15523e1c7735d0a9c86a8646ead75f00213c53 /web_src/js
parentf626366f530075a23de2a821f232968e71011828 (diff)
downloadgitea-8b5c081d766bc7be725b07a8abfb2d8f39c45fd3.tar.gz
gitea-8b5c081d766bc7be725b07a8abfb2d8f39c45fd3.zip
Remove fomantic loader module (#26670)
Replace Fomantic `loader` CSS module with our existing `is-loading` spinner. Only three places in the UI used this module, which are pictured here: imagediff: <img width="1237" alt="Screenshot 2023-08-22 at 22 18 01" src="https://github.com/go-gitea/gitea/assets/115237/b0d82531-f05e-43c6-9e5b-1bfc268c056d"> webauthn: <img width="894" alt="Screenshot 2023-08-22 at 22 05 05" src="https://github.com/go-gitea/gitea/assets/115237/7b583425-d944-474a-a57a-22a65bbd8b29"> heatmap (I removed the previous loading text, it was unreadable because it was tiny and on fast machines only visible for a fraction of a second): <img width="764" alt="Screenshot 2023-08-22 at 22 18 44" src="https://github.com/go-gitea/gitea/assets/115237/1c7472d6-3e17-4224-a992-d8c0b380cc73"> Also, heatmap container does not resize any more after loading now and previous duplicate id `user-heatmap` is gone. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'web_src/js')
-rw-r--r--web_src/js/components/ActivityHeatmap.vue24
-rw-r--r--web_src/js/features/heatmap.js2
2 files changed, 12 insertions, 14 deletions
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index acae1aedd0..1b083ed134 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -1,18 +1,16 @@
<template>
- <div id="user-heatmap">
- <div class="total-contributions">
- {{ locale.contributions_in_the_last_12_months }}
- </div>
- <calendar-heatmap
- :locale="locale"
- :no-data-text="locale.no_contributions"
- :tooltip-unit="locale.contributions"
- :end-date="endDate"
- :values="values"
- :range-color="colorRange"
- @day-click="handleDayClick($event)"
- />
+ <div class="total-contributions">
+ {{ locale.contributions_in_the_last_12_months }}
</div>
+ <calendar-heatmap
+ :locale="locale"
+ :no-data-text="locale.no_contributions"
+ :tooltip-unit="locale.contributions"
+ :end-date="endDate"
+ :values="values"
+ :range-color="colorRange"
+ @day-click="handleDayClick($event)"
+ />
</template>
<script>
import {CalendarHeatmap} from 'vue3-calendar-heatmap';
diff --git a/web_src/js/features/heatmap.js b/web_src/js/features/heatmap.js
index 2c65293b64..b6f06d0cfb 100644
--- a/web_src/js/features/heatmap.js
+++ b/web_src/js/features/heatmap.js
@@ -30,8 +30,8 @@ export function initHeatmap() {
};
const View = createApp(ActivityHeatmap, {values, locale});
-
View.mount(el);
+ el.classList.remove('is-loading');
} catch (err) {
console.error('Heatmap failed to load', err);
el.textContent = 'Heatmap failed to load';