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

Jump to bottom

Loader icon does not show (font-awesome icon "fa-circle-notch") #2702 #2703

Merged
merged 1 commit into from
May 19, 2022
Merged

Loader icon does not show (font-awesome icon "fa-circle-notch") #2702 #2703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 js/components/conceptset/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ define(['knockout','utils/CommonUtils', 'utils/Renderers', 'services/http','atla
const tooltip = d.ANCESTORS.map(d => commonUtils.escapeTooltip(d.CONCEPT_NAME)).join('<br/>');
return `<a data-bind="click: d => $parents[1].showAncestorsModal(d.CONCEPT_ID), tooltip: '${tooltip}'">${d.ANCESTORS.length}</a>`
} else {
return `<i class="fa fa-circle-o-notch fa-spin"></i>`;
return `<i class="fa fa-circle-notch fa-spin"></i>`;
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion js/components/conceptsetInclusionCount/conceptsetInclusionCount.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<span class="badge" data-bind="if: !countLoading()"><span data-bind="text:inclusionCount()"></span></span>
<span class="badge" data-bind="if: countLoading()"><i class="fa fa-circle-o-notch fa-spin"></i></span>
<span class="badge" data-bind="if: countLoading()"><i class="fa fa-circle-notch fa-spin"></i></span>
6 changes: 3 additions & 3 deletions js/components/evidence/components/negative-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ define(['knockout',
this.linkoutConditionConceptIds = [];
this.sourceIds = config.cemOptions.evidenceLinkoutSources;
this.recordCountClass = ko.pureComputed(() => {
return this.recordCountsRefreshing() ? "fa fa-circle-o-notch fa-spin fa-lg" : "fa fa-database fa-lg";
return this.recordCountsRefreshing() ? "fa fa-circle-notch fa-spin fa-lg" : "fa fa-database fa-lg";
});
this.newConceptSetName = ko.observable(this.conceptSet()
.name() + " - Candidate Controls");
Expand Down Expand Up @@ -333,11 +333,11 @@ define(['knockout',
this.recordCountsRefreshing(true);
$("#dtNegCtrlRC")
.toggleClass("fa-database")
.toggleClass("fa-circle-o-notch")
.toggleClass("fa-circle-notch")
.toggleClass("fa-spin");
$("#dtNegCtrlDRC")
.toggleClass("fa-database")
.toggleClass("fa-circle-o-notch")
.toggleClass("fa-circle-notch")
.toggleClass("fa-spin");
$(".ncRecordCount").each(function(index) { $(this).text("...") });
var negativeControls = this.negativeControls();
Expand Down
2 changes: 1 addition & 1 deletion js/components/userbar/user-bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="wrapperHeader">
<!-- ko if: loading -->
<div data-bind="css: classes('loading')">
<i class="fa fa-circle-o-notch fa-spin"></i>
<i class="fa fa-circle-notch fa-spin"></i>
</div>
<!-- /ko -->
<!-- ko ifnot: loading -->
Expand Down
4 changes: 2 additions & 2 deletions js/extensions/bindings/datatableBinding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@ define([

} else { // more the data - slower the all-selection/deselection. add spinner
e.target.classList.remove('fa-check');
e.target.classList.add('fa-circle-o-notch', 'fa-spin');
e.target.classList.add('fa-circle-notch', 'fa-spin');
setTimeout(() => {
e.target.classList.toggle('selected');
c.selectAll($(element).DataTable().rows( { filter : 'applied'} ).data(),
e.target.classList.contains('selected'));
e.target.classList.add('fa-check');
e.target.classList.remove('fa-circle-o-notch', 'fa-spin');
e.target.classList.remove('fa-circle-notch', 'fa-spin');
}, 50);
}
});
Expand Down
16 changes: 8 additions & 8 deletions js/pages/cohort-definitions/components/reporting/cost-utilization/report-manager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- ko if:$component.showSelectionArea -->
<div class="wrapperTitle">
<span data-bind="if:!$component.loadingReport()"><i class="fa fa-chart-area"></i></span>
<span data-bind="if:$component.loadingReport()"><i class="fa fa-circle-o-notch fa-spin"></i></span>
<span data-bind="if:$component.loadingReport()"><i class="fa fa-circle-notch fa-spin"></i></span>
<span data-bind="text: ko.i18n('cohortDefinitions.costUtilization.reportManager.reportManagerText_1', 'Cohort Reporting')"></span>
</div>

Expand Down Expand Up @@ -374,7 +374,7 @@
</div>

<div class="loader" data-bind="if:$component.loadingReportDrilldown">
<i class="fa fa-circle-o-notch fa-spin"></i>
<i class="fa fa-circle-notch fa-spin"></i>
<span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
</div>
<div data-bind="if:$component.activeReportDrilldown">
Expand Down Expand Up @@ -548,7 +548,7 @@
</div>

<div class="loader" data-bind="if:$component.loadingReportDrilldown">
<i class="fa fa-circle-o-notch fa-spin"></i>
<i class="fa fa-circle-notch fa-spin"></i>
<span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
</div>
<div data-bind="if:$component.activeReportDrilldown">
Expand Down Expand Up @@ -640,7 +640,7 @@
</div>
</div>
<div class="loader" data-bind="if:$component.loadingReportDrilldown">
<i class="fa fa-circle-o-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
<i class="fa fa-circle-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
</div>
<div data-bind="if:$component.activeReportDrilldown">
<div id="procedureDrilldownScatterplotHeading" class="reportSectionHeading">
Expand Down Expand Up @@ -709,7 +709,7 @@
</div>
</div>
<div class="loader" data-bind="if:$component.loadingReportDrilldown">
<i class="fa fa-circle-o-notch fa-spin"></i>
<i class="fa fa-circle-notch fa-spin"></i>
<div class="treemap_legend">
<span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
</div>
Expand Down Expand Up @@ -807,7 +807,7 @@
</div>

<div class="loader" data-bind="if:$component.loadingReportDrilldown">
<i class="fa fa-circle-o-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
<i class="fa fa-circle-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
</div>

<div data-bind="if:$component.activeReportDrilldown">
Expand Down Expand Up @@ -902,7 +902,7 @@
</div>

<div class="loader" data-bind="if:$component.loadingReportDrilldown">
<i class="fa fa-circle-o-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
<i class="fa fa-circle-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
</div>
<div data-bind="if:$component.activeReportDrilldown">
<div class="heading" id="drugExposureDrilldown"></div>
Expand Down Expand Up @@ -1022,7 +1022,7 @@
</div>

<div class="loader" data-bind="if:$component.loadingReportDrilldown">
<i class="fa fa-circle-o-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
<i class="fa fa-circle-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loading', 'Loading')"></span>
</div>
<div data-bind="if:$component.activeReportDrilldown">
<div class="heading" id="procedureDrilldown"></div>
Expand Down
12 changes: 6 additions & 6 deletions js/pages/concept-sets/components/tabs/conceptset-compare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ define([
});
this.compareLoading = ko.observable(false);
this.compareLoadingClass = ko.pureComputed(() => {
return this.compareLoading() ? "fa fa-circle-o-notch fa-spin fa-lg" : "fa fa-question-circle fa-lg"
return this.compareLoading() ? "fa fa-circle-notch fa-spin fa-lg" : "fa fa-question-circle fa-lg"
});
this.compareNewConceptSetName = ko.observable(this.currentConceptSet().name() + ko.i18n('cs.browser.compare.saveFromComparisonNameTail', ' - From Comparison')());
this.compareResultsColumns = [{
Expand Down Expand Up @@ -229,7 +229,7 @@ define([
});
this.recordCountsRefreshing = ko.observable(false);
this.recordCountClass = ko.pureComputed(() => {
return this.recordCountsRefreshing() ? "fa fa-circle-o-notch fa-spin fa-lg" : "fa fa-database fa-lg";
return this.recordCountsRefreshing() ? "fa fa-circle-notch fa-spin fa-lg" : "fa fa-database fa-lg";
});
this.conceptSetLoading = ko.observable(false);
}
Expand Down Expand Up @@ -342,11 +342,11 @@ define([
this.recordCountsRefreshing(true);
$("#dtConeptManagerRC")
.removeClass("fa-database")
.addClass("fa-circle-o-notch")
.addClass("fa-circle-notch")
.addClass("fa-spin");
$("#dtConeptManagerDRC")
.removeClass("fa-database")
.addClass("fa-circle-o-notch")
.addClass("fa-circle-notch")
.addClass("fa-spin");
var compareResults = this.compareResults();
var conceptIds = $.map(compareResults, function (o, n) {
Expand All @@ -358,11 +358,11 @@ define([
this.recordCountsRefreshing(false);
$("#dtConeptManagerRC")
.addClass("fa-database")
.removeClass("fa-circle-o-notch")
.removeClass("fa-circle-notch")
.removeClass("fa-spin");
$("#dtConeptManagerDRC")
.addClass("fa-database")
.removeClass("fa-circle-o-notch")
.removeClass("fa-circle-notch")
.removeClass("fa-spin");
});
}
Expand Down
2 changes: 1 addition & 1 deletion js/pages/concept-sets/conceptset-manager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}">
<div data-bind="css: classes('optimize-modal-content')">
<div data-bind="if: optimizeLoading()">
<i class="fa fa-circle-o-notch fa-spin fa-lg"></i>
<i class="fa fa-circle-notch fa-spin fa-lg"></i>
<span data-bind="text: ko.i18n('cs.manager.attemptingToFindMessage', 'Attempting to find an optimal definition for this concept set...')"></span>
</div>
<div data-bind="if: !optimizeLoading() && !optimizerFoundSomething()">
Expand Down
2 changes: 1 addition & 1 deletion js/pages/configuration/configuration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ define([
break;
case sourceApi.buttonCheckState.checking:
buttonClass = 'btn-warning';
iconClass = 'fa-circle-o-notch fa-spin';
iconClass = 'fa-circle-notch fa-spin';
break;
}
return {
Expand Down
2 changes: 1 addition & 1 deletion js/pages/configuration/roles/role-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- ko if:loading -->
<div class="wrapperTitle">
<i class="fa fa-circle-o-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loadingWithDots', 'Loading...')"></span>
<i class="fa fa-circle-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loadingWithDots', 'Loading...')"></span>
</div>
<!-- /ko -->
<!-- ko ifnot:loading -->
Expand Down
2 changes: 1 addition & 1 deletion js/pages/configuration/roles/roles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- ko if:loading -->
<div class="wrapperTitle">
<i class="fa fa-circle-o-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loadingWithDots', 'Loading...')"></span>
<i class="fa fa-circle-notch fa-spin"></i> <span data-bind="text: ko.i18n('common.loadingWithDots', 'Loading...')"></span>
</div>
<!-- /ko -->
<!-- ko ifnot:loading -->
Expand Down
6 changes: 3 additions & 3 deletions js/pages/vocabulary/components/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ define([
});
this.recordCountsRefreshing = ko.observable(false);
this.recordCountClass = ko.pureComputed(() => {
return this.recordCountsRefreshing() ? "fa fa-circle-o-notch fa-spin fa-lg" : "fa fa-database fa-lg";
return this.recordCountsRefreshing() ? "fa fa-circle-notch fa-spin fa-lg" : "fa fa-database fa-lg";
});

this.isAuthenticated = authApi.isAuthenticated;
Expand Down Expand Up @@ -484,12 +484,12 @@ define([
if (enable) {
$('#' + column.elementId)
.removeClass(column.icon)
.addClass("fa-circle-o-notch")
.addClass("fa-circle-notch")
.addClass("fa-spin");
} else {
$('#' + column.elementId)
.addClass(column.icon)
.removeClass("fa-circle-o-notch")
.removeClass("fa-circle-notch")
.removeClass("fa-spin");
}
}
Expand Down
2 changes: 1 addition & 1 deletion js/styles/atlas.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ i.fa.fa-refresh.fa-spin {
padding-right: 0px;
}

.i.fa.fa-circle-o-notch.fa-spin {
.i.fa.fa-circle-notch.fa-spin {
font-size: .9em;
padding-right: 0px;
}
Expand Down