Version push and cleanup of loadingBar.js

assets/css/loading.css

@@ -45,7 +45,7 @@
 
 	/* Content ------------------------------------------------*/
 	#loading h1 {
-		margin: 13px;
+		margin: 13px 13px 0px 13px;
 		color: #ddd;
 		font-size: 14px;
 		font-weight: bold;

assets/js/loadingBar.js

@@ -11,48 +11,77 @@ loadingBar = {
 
 	show: function(status, errorText) {
 
-		if (status==="error") {
+		if (status==='error') {
 
-			loadingBar.status = "error";
+			// Set status
+			loadingBar.status = 'error';
 
-			if (!errorText) errorText = "Whoops, it looks like something went wrong. Please reload the site and try again!";
+			// Parse text
+			if (errorText) errorText = errorText.replace('<br>', '');
+			if (!errorText) errorText = 'Whoops, it looks like something went wrong. Please reload the site and try again!';
 
+			// Move header down
+			if (visible.controls()) lychee.header.addClass('error');
+
+			// Modify loading
 			lychee.loadingBar
-				.removeClass("loading uploading error")
+				.removeClass('loading uploading error')
 				.addClass(status)
-				.html("<h1>Error: <span>" + errorText + "</span></h1>")
+				.html('<h1>Error: <span>' + errorText + '</span></h1>')
 				.show()
-				.css("height", "40px");
-			if (visible.controls()) lychee.header.addClass("error");
+				.css('height', '40px');
+
+			// Set timeout
+			clearTimeout(lychee.loadingBar.data('timeout'));
+			lychee.loadingBar.data('timeout', setTimeout(function() { loadingBar.hide(true) }, 3000));
+
+			return true;
+
+		}
+
+		if (loadingBar.status===null) {
 
-			clearTimeout(lychee.loadingBar.data("timeout"));
-			lychee.loadingBar.data("timeout", setTimeout(function() { loadingBar.hide(true) }, 3000));
+			// Set status
+			loadingBar.status = 'loading';
 
-		} else if (loadingBar.status===null) {
+			// Set timeout
+			clearTimeout(lychee.loadingBar.data('timeout'));
+			lychee.loadingBar.data('timeout', setTimeout(function() {
 
-			loadingBar.status = "loading";
+				// Move header down
+				if (visible.controls()) lychee.header.addClass('loading');
 
-			clearTimeout(lychee.loadingBar.data("timeout"));
-			lychee.loadingBar.data("timeout", setTimeout(function() {
+				// Modify loading
 				lychee.loadingBar
-					.show()
-					.removeClass("loading uploading error")
-					.addClass("loading");
-				if (visible.controls()) lychee.header.addClass("loading");
+					.removeClass('loading uploading error')
+					.addClass('loading')
+					.show();
+
 			}, 1000));
 
+			return true;
+
 		}
 
 	},
 
-	hide: function(force_hide) {
+	hide: function(force) {
 
-		if ((loadingBar.status!=="error"&&loadingBar.status!==null)||force_hide) {
+		if ((loadingBar.status!=='error'&&loadingBar.status!==null)||force) {
 
+			// Remove status
 			loadingBar.status = null;
-			clearTimeout(lychee.loadingBar.data("timeout"));
-			lychee.loadingBar.html("").css("height", "3px");
-			if (visible.controls()) lychee.header.removeClass("error loading");
+
+			// Move header up
+			if (visible.controls()) lychee.header.removeClass('error loading');
+
+			// Modify loading
+			lychee.loadingBar
+				.html('')
+				.css('height', '3px');
+
+			// Set timeout
+			clearTimeout(lychee.loadingBar.data('timeout'));
 			setTimeout(function() { lychee.loadingBar.hide() }, 300);
 
 		}

assets/js/lychee.js

@@ -8,7 +8,7 @@
 var lychee = {
 
 	title: "",
-	version: "2.1.1",
+	version: "2.2",
 
 	api_path: "php/api.php",
 	update_path: "http://lychee.electerious.com/version/index.php",