archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Use loadingBar utility.

Browse Source
This commit is contained in:
Pablo Vazquez
2018-09-20 15:20:58 +02:00
parent 7ba8ff7580
commit 7983a7b038
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/templates/layout.pug
View File

@@ -122,7 +122,7 @@ html(lang="en")
title="Sign up") Sign up title="Sign up") Sign up
| {% endif %} | {% endif %}
.loader-bar .loading-bar
.page-content .page-content
#search-overlay #search-overlay

12
src/templates/projects/view.pug
View File

@@ -349,7 +349,7 @@ script.
// TODO: Maybe remove this, now it's also in loadNodeContent(), but double-check // TODO: Maybe remove this, now it's also in loadNodeContent(), but double-check
// it's done like that in all users of updateUi(). // it's done like that in all users of updateUi().
$('.loader-bar').removeClass('active'); loadingBarHide();
} }
| {% endblock %} | {% endblock %}
@@ -377,7 +377,9 @@ script.
function loadNodeContent(url, nodeId) { function loadNodeContent(url, nodeId) {
$('.loader-bar').addClass('active');
loadingBarShow();
$.get(url, function(dataHtml) { $.get(url, function(dataHtml) {
// Update the DOM injecting the generate HTML into the page // Update the DOM injecting the generate HTML into the page
$('#project_context').html(dataHtml); $('#project_context').html(dataHtml);
@@ -390,14 +392,14 @@ script.
$('#server_error').attr('src', url); $('#server_error').attr('src', url);
}) })
.always(function(){ .always(function(){
$('.loader-bar').removeClass('active'); loadingBarHide();
$('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin'); $('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin');
}); });
} }
function loadProjectContent(url) { function loadProjectContent(url) {
$('.loader-bar').addClass('active'); loadingBarShow();
$.get(url, function(dataHtml) { $.get(url, function(dataHtml) {
// Update the DOM injecting the generated HTML into the page // Update the DOM injecting the generated HTML into the page
@@ -413,7 +415,7 @@ script.
$('#server_error').attr('src', url); $('#server_error').attr('src', url);
}) })
.always(function(){ .always(function(){
$('.loader-bar').removeClass('active'); loadingBarHide();
$('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin'); $('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin');
}); });
} }