Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Adapt Topbar Loading Styling to be used in Main Page definition -
Browse files Browse the repository at this point in the history
MEED-8266 - Meeds-io/MIPs#175

This change will adapt the Topbar Loading styling since it has been moved from Topbar Container definition to portal main page (UIPortalApplication).
boubaker committed Jan 29, 2025
1 parent 5f04210 commit 71abd32
Showing 4 changed files with 11 additions and 11 deletions.
3 changes: 0 additions & 3 deletions webapp/src/main/webapp/WEB-INF/gatein-resources.xml
Original file line number Diff line number Diff line change
@@ -2938,9 +2938,6 @@
<script>
<path>/js/TopbarLoading.js</path>
</script>
<depends>
<module>jquery</module>
</depends>
</module>

<module>
7 changes: 4 additions & 3 deletions webapp/src/main/webapp/js/TopbarLoading.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function($) {
(function() {
document.addEventListener("readystatechange", () => {
if (document.readyState === 'complete') {
document.dispatchEvent(new CustomEvent('hideTopBarLoading'));
@@ -9,17 +9,18 @@
init: () => {
document.addEventListener('displayTopBarLoading', () => {
operationsInProgress++;
$('.TopbarLoadingContainer').removeClass('hidden');
document.querySelector('#TopbarLoading').classList.remove('hidden');
});

document.addEventListener('hideTopBarLoading', () => {
if (operationsInProgress > 0) {
operationsInProgress--;
}
if (operationsInProgress === 0) {
$('.TopbarLoadingContainer').addClass('hidden');
document.querySelector('#TopbarLoading').classList.add('hidden');
}
});
document.querySelector('#TopbarLoading').classList.add('hidden');
},
};
})($);
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
:target="breadcrumb.target === 'SAME_TAB' && '_self' || '_blank'"
:disabled="!breadcrumb.uri"
:class="!breadcrumb.uri && 'text-subtitle-color'"
height="52"
height="var(--appHeight, 52)"
min-width="45px"
max-width="250px"
class="pa-0 d-flex align-center"
@@ -42,7 +42,7 @@
v-else
disabled
min-width="45px"
height="52"
height="var(--appHeight, 52)"
class="pa-0 text-subtitle-color d-flex align-center justify-center flex-shrink-1"
flat>
{{ breadcrumb.label }}
Original file line number Diff line number Diff line change
@@ -22,13 +22,15 @@
<space-invite-buttons-group
v-if="isManager"
class="me-4" />
<div v-if="peopleCount"
<div
v-if="peopleCount"
class="showingPeopleText text-subtitle d-none my-auto d-sm-flex">
{{ $t('peopleList.label.peopleCount', {0: peopleCount}) }}
</div>
<div v-else
<div
v-else
class="showingPeopleText text-subtitle d-none my-auto d-sm-flex">
{{ $t('Search.noResults')}}
{{ $t('Search.noResults') }}
</div>
</div>
</template>

0 comments on commit 71abd32

Please sign in to comment.