Browse Source

LoadingBar improvements

Tobias Reich 9 years ago
parent
commit
5686e83461
4 changed files with 5 additions and 8 deletions
  1. 0 0
      dist/main.css
  2. 0 0
      dist/main.js
  3. 3 8
      src/scripts/loadingBar.js
  4. 2 0
      src/styles/_loading.scss

File diff suppressed because it is too large
+ 0 - 0
dist/main.css


File diff suppressed because it is too large
+ 0 - 0
dist/main.js


+ 3 - 8
src/scripts/loadingBar.js

@@ -34,10 +34,9 @@ loadingBar.show = function(status, errorText) {
 		// Modify loading
 		loadingBar.dom()
 			.removeClass('loading uploading error')
-			.addClass(status)
 			.html('<h1>Error: <span>' + errorText + '</span></h1>')
-			.show()
-			.css('height', '40px');
+			.addClass(status)
+			.show();
 
 		// Set timeout
 		clearTimeout(loadingBar._timeout);
@@ -66,6 +65,7 @@ loadingBar.show = function(status, errorText) {
 			// Modify loading
 			loadingBar.dom()
 				.removeClass('loading uploading error')
+				.html('')
 				.addClass('loading')
 				.show();
 
@@ -87,11 +87,6 @@ loadingBar.hide = function(force) {
 		// Move header up
 		if (visible.header()) header.dom().removeClass('error loading');
 
-		// Modify loading
-		loadingBar.dom()
-			.html('')
-			.css('height', '3px');
-
 		// Set timeout
 		clearTimeout(loadingBar._timeout);
 		setTimeout(function() { loadingBar.dom().hide() }, 300);

+ 2 - 0
src/styles/_loading.scss

@@ -18,10 +18,12 @@
 
 	/* Modes ------------------------------------------------*/
 	&.loading {
+		height: 3px;
 		background-image: linear-gradient(to right, #153674 0%, #153674 47%, #2651AE 53%, #2651AE 100%);
 		z-index: 2;
 	}
 	&.error {
+		height: 40px;
 		background-color: #2f0d0e;
 		background-image: linear-gradient(to right, #451317 0%, #451317 47%, #AA3039 53%, #AA3039 100%);
 		z-index: 1;

Some files were not shown because too many files changed in this diff