Code cleanup

src/scripts/upload.js

@@ -3,403 +3,401 @@
  * @copyright	2014 by Tobias Reich
  */
 
-upload = {
+upload = {}
 
-	show: function(title, files, callback) {
+upload.show = function(title, files, callback) {
 
-		upload.close(true);
-		$("body").append(build.uploadModal(title, files));
+	upload.close(true);
+	$("body").append(build.uploadModal(title, files));
 
-		if (callback!==null&&callback!==undefined) callback();
+	if (callback!==null&&callback!==undefined) callback();
 
-	},
-
-	notify: function(title, text) {
+}
 
-		var popup;
+upload.notify = function(title, text) {
 
-		if (!text||text==="") text = "You can now manage your new photo(s).";
+	var popup;
 
-		if (!window.webkitNotifications) return false;
+	if (!text||text==="") text = "You can now manage your new photo(s).";
 
-		if (window.webkitNotifications.checkPermission()!==0) window.webkitNotifications.requestPermission();
+	if (!window.webkitNotifications) return false;
 
-		if (window.webkitNotifications.checkPermission()===0&&title) {
-			popup = window.webkitNotifications.createNotification("", title, text);
-			popup.show();
-		}
+	if (window.webkitNotifications.checkPermission()!==0) window.webkitNotifications.requestPermission();
 
-	},
+	if (window.webkitNotifications.checkPermission()===0&&title) {
+		popup = window.webkitNotifications.createNotification("", title, text);
+		popup.show();
+	}
 
-	start: {
+}
 
-		local: function(files) {
+upload.start = {
 
-			var albumID = album.getID(),
-				error = false,
-				process = function(files, file) {
+	local: function(files) {
 
-					var formData = new FormData(),
-						xhr = new XMLHttpRequest(),
-						pre_progress = 0,
-						progress,
-						finish = function() {
+		var albumID = album.getID(),
+			error = false,
+			process = function(files, file) {
 
-							window.onbeforeunload = null;
+				var formData = new FormData(),
+					xhr = new XMLHttpRequest(),
+					pre_progress = 0,
+					progress,
+					finish = function() {
 
-							$("#upload_files").val("");
+						window.onbeforeunload = null;
 
-							if (error===false) {
+						$("#upload_files").val("");
 
-								// Success
-								upload.close();
-								upload.notify("Upload complete");
+						if (error===false) {
 
-							} else {
+							// Success
+							upload.close();
+							upload.notify("Upload complete");
 
-								// Error
-								$(".upload_message a.close").show();
-								upload.notify("Upload complete", "Failed to upload one or more photos.");
+						} else {
 
-							}
+							// Error
+							$(".upload_message a.close").show();
+							upload.notify("Upload complete", "Failed to upload one or more photos.");
 
-							albums.refresh();
+						}
 
-							if (album.getID()===false) lychee.goto("0");
-							else album.load(albumID);
+						albums.refresh();
 
-						};
+						if (album.getID()===false) lychee.goto("0");
+						else album.load(albumID);
 
-					// Check if file is supported
-					if (file.supported===false) {
+					};
 
-						// Skip file
-						if (file.next!==null) process(files, file.next);
-						else {
+				// Check if file is supported
+				if (file.supported===false) {
 
-							// Look for supported files
-							// If zero files are supported, hide the upload after a delay
+					// Skip file
+					if (file.next!==null) process(files, file.next);
+					else {
 
-							var hasSupportedFiles = false;
+						// Look for supported files
+						// If zero files are supported, hide the upload after a delay
 
-							for (var i = 0; i < files.length; i++) {
+						var hasSupportedFiles = false;
 
-								if (files[i].supported===true) {
-									hasSupportedFiles = true;
-									break;
-								}
+						for (var i = 0; i < files.length; i++) {
 
+							if (files[i].supported===true) {
+								hasSupportedFiles = true;
+								break;
 							}
 
-							if (hasSupportedFiles===false) setTimeout(finish, 2000);
-
 						}
 
-						return false;
+						if (hasSupportedFiles===false) setTimeout(finish, 2000);
 
 					}
 
-					formData.append("function", "upload");
-					formData.append("albumID", albumID);
-					formData.append("tags", "");
-					formData.append(0, file);
+					return false;
 
-					xhr.open("POST", lychee.api_path);
+				}
 
-					xhr.onload = function() {
+				formData.append("function", "upload");
+				formData.append("albumID", albumID);
+				formData.append("tags", "");
+				formData.append(0, file);
 
-						var wait = false,
-							errorText = "";
+				xhr.open("POST", lychee.api_path);
 
-						file.ready = true;
+				xhr.onload = function() {
 
-						// Set status
-						if (xhr.status===200&&xhr.responseText==="1") {
+					var wait = false,
+						errorText = "";
 
-							// Success
-							$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status")
-								.html("Finished")
-								.addClass("success");
+					file.ready = true;
 
-						} else {
+					// Set status
+					if (xhr.status===200&&xhr.responseText==="1") {
 
-							// Error
-							$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status")
-								.html("Error")
-								.addClass("error");
+						// Success
+						$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status")
+							.html("Finished")
+							.addClass("success");
 
-							if (xhr.responseText.substr(0, 6)==="Error:") errorText = xhr.responseText.substr(6) + " Please take a look at the console of your browser for further details.";
-							else errorText = "Server returned an unknown response. Please take a look at the console of your browser for further details.";
+					} else {
 
-							$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") p.notice")
-								.html(errorText)
-								.show();
+						// Error
+						$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status")
+							.html("Error")
+							.addClass("error");
 
-							// Set global error
-							error = true;
+						if (xhr.responseText.substr(0, 6)==="Error:") errorText = xhr.responseText.substr(6) + " Please take a look at the console of your browser for further details.";
+						else errorText = "Server returned an unknown response. Please take a look at the console of your browser for further details.";
 
-							// Throw error
-							lychee.error("Upload failed. Server returned the status code " + xhr.status + "!", xhr, xhr.responseText);
+						$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") p.notice")
+							.html(errorText)
+							.show();
 
-						}
+						// Set global error
+						error = true;
 
-						// Check if there are file which are not finished
-						for (var i = 0; i < files.length; i++) {
+						// Throw error
+						lychee.error("Upload failed. Server returned the status code " + xhr.status + "!", xhr, xhr.responseText);
 
-							if (files[i].ready===false) {
-								wait = true;
-								break;
-							}
+					}
+
+					// Check if there are file which are not finished
+					for (var i = 0; i < files.length; i++) {
 
+						if (files[i].ready===false) {
+							wait = true;
+							break;
 						}
 
-						// Finish upload when all files are finished
-						if (wait===false) finish();
+					}
 
-					};
+					// Finish upload when all files are finished
+					if (wait===false) finish();
 
-					xhr.upload.onprogress = function(e) {
+				};
 
-						if (e.lengthComputable) {
+				xhr.upload.onprogress = function(e) {
 
-							// Calculate progress
-							progress = (e.loaded / e.total * 100 | 0);
+					if (e.lengthComputable) {
 
-							// Set progress when progress has changed
-							if (progress>pre_progress) {
-								$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status").html(progress + "%");
-								pre_progress = progress;
-							}
+						// Calculate progress
+						progress = (e.loaded / e.total * 100 | 0);
 
-							if (progress>=100) {
+						// Set progress when progress has changed
+						if (progress>pre_progress) {
+							$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status").html(progress + "%");
+							pre_progress = progress;
+						}
 
-								// Scroll to the uploading file
-								var scrollPos = 0;
-								if ((file.num+1)>4) scrollPos = (file.num + 1 - 4) * 40
-								$(".upload_message .rows").scrollTop(scrollPos);
+						if (progress>=100) {
 
-								// Set status to processing
-								$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status").html("Processing");
+							// Scroll to the uploading file
+							var scrollPos = 0;
+							if ((file.num+1)>4) scrollPos = (file.num + 1 - 4) * 40
+							$(".upload_message .rows").scrollTop(scrollPos);
 
-								// Upload next file
-								if (file.next!==null) process(files, file.next);
+							// Set status to processing
+							$(".upload_message .rows .row:nth-child(" + (file.num+1) + ") .status").html("Processing");
 
-							}
+							// Upload next file
+							if (file.next!==null) process(files, file.next);
 
 						}
 
-					};
-
-					xhr.send(formData);
+					}
 
 				};
 
-			if (files.length<=0) return false;
-			if (albumID===false||visible.albums()===true) albumID = 0;
+				xhr.send(formData);
 
-			for (var i = 0; i < files.length; i++) {
+			};
 
-				files[i].num = i;
-				files[i].ready = false;
-				files[i].supported = true;
+		if (files.length<=0) return false;
+		if (albumID===false||visible.albums()===true) albumID = 0;
 
-				if (i < files.length-1) files[i].next = files[i+1];
-				else files[i].next = null;
+		for (var i = 0; i < files.length; i++) {
 
-				// Check if file is supported
-				if (files[i].type!=="image/jpeg"&&files[i].type!=="image/jpg"&&files[i].type!=="image/png"&&files[i].type!=="image/gif") {
+			files[i].num = i;
+			files[i].ready = false;
+			files[i].supported = true;
 
-					files[i].ready = true;
-					files[i].supported = false;
+			if (i < files.length-1) files[i].next = files[i+1];
+			else files[i].next = null;
 
-				}
+			// Check if file is supported
+			if (files[i].type!=="image/jpeg"&&files[i].type!=="image/jpg"&&files[i].type!=="image/png"&&files[i].type!=="image/gif") {
+
+				files[i].ready = true;
+				files[i].supported = false;
 
 			}
 
-			window.onbeforeunload = function() { return "Lychee is currently uploading!"; };
+		}
 
-			upload.show("Uploading", files);
+		window.onbeforeunload = function() { return "Lychee is currently uploading!"; };
 
-			// Upload first file
-			process(files, files[0]);
+		upload.show("Uploading", files);
 
-		},
+		// Upload first file
+		process(files, files[0]);
 
-		url: function() {
+	},
 
-			var albumID = album.getID(),
-				params,
-				extension,
-				buttons,
-				link,
-				files = [];
+	url: function() {
 
-			if (albumID===false) albumID = 0;
+		var albumID = album.getID(),
+			params,
+			extension,
+			buttons,
+			link,
+			files = [];
 
-			buttons = [
-				["Import", function() {
+		if (albumID===false) albumID = 0;
 
-					link = $(".message input.text").val();
+		buttons = [
+			["Import", function() {
 
-					if (link&&link.length>3) {
+				link = $(".message input.text").val();
 
-						extension = link.split('.').pop();
-						if (extension!=="jpeg"&&extension!=="jpg"&&extension!=="png"&&extension!=="gif"&&extension!=="webp") {
-							loadingBar.show("error", "The file format of this link is not supported.");
-							return false;
-						}
+				if (link&&link.length>3) {
 
-						files[0] = {
-							name: link,
-							supported: true
-						}
+					extension = link.split('.').pop();
+					if (extension!=="jpeg"&&extension!=="jpg"&&extension!=="png"&&extension!=="gif"&&extension!=="webp") {
+						loadingBar.show("error", "The file format of this link is not supported.");
+						return false;
+					}
+
+					files[0] = {
+						name: link,
+						supported: true
+					}
 
-						upload.show("Importing URL", files, function() {
-							$(".upload_message .rows .row .status").html("Importing");
-						});
+					upload.show("Importing URL", files, function() {
+						$(".upload_message .rows .row .status").html("Importing");
+					});
 
-						params = "importUrl&url=" + escape(encodeURI(link)) + "&albumID=" + albumID;
-						lychee.api(params, function(data) {
+					params = "importUrl&url=" + escape(encodeURI(link)) + "&albumID=" + albumID;
+					lychee.api(params, function(data) {
 
-							upload.close();
-							upload.notify("Import complete");
+						upload.close();
+						upload.notify("Import complete");
 
-							albums.refresh();
+						albums.refresh();
 
-							if (album.getID()===false) lychee.goto("0");
-							else album.load(albumID);
+						if (album.getID()===false) lychee.goto("0");
+						else album.load(albumID);
 
-							if (data!==true) lychee.error(null, params, data);
+						if (data!==true) lychee.error(null, params, data);
 
-						});
+					});
 
-					} else loadingBar.show("error", "Link to short or too long. Please try another one!");
+				} else loadingBar.show("error", "Link to short or too long. Please try another one!");
 
-				}],
-				["Cancel", function() {}]
-			];
+			}],
+			["Cancel", function() {}]
+		];
 
-			modal.show("Import from Link", "Please enter the direct link to a photo to import it: <input class='text' type='text' placeholder='http://' value='http://'>", buttons);
+		modal.show("Import from Link", "Please enter the direct link to a photo to import it: <input class='text' type='text' placeholder='http://' value='http://'>", buttons);
 
-		},
+	},
 
-		server: function() {
+	server: function() {
 
-			var albumID = album.getID(),
-				params,
-				buttons,
-				files = [],
-				path;
+		var albumID = album.getID(),
+			params,
+			buttons,
+			files = [],
+			path;
 
-			if (albumID===false) albumID = 0;
+		if (albumID===false) albumID = 0;
 
-			buttons = [
-				["Import", function() {
+		buttons = [
+			["Import", function() {
 
-					path = $(".message input.text").val();
+				path = $(".message input.text").val();
 
-					files[0] = {
-						name: path,
-						supported: true
-					};
+				files[0] = {
+					name: path,
+					supported: true
+				};
 
-					upload.show("Importing from server", files, function() {
-						$(".upload_message .rows .row .status").html("Importing");
-					});
+				upload.show("Importing from server", files, function() {
+					$(".upload_message .rows .row .status").html("Importing");
+				});
 
-					params = "importServer&albumID=" + albumID + "&path=" + escape(encodeURI(path));
-					lychee.api(params, function(data) {
+				params = "importServer&albumID=" + albumID + "&path=" + escape(encodeURI(path));
+				lychee.api(params, function(data) {
 
-						upload.close();
-						upload.notify("Import complete");
+					upload.close();
+					upload.notify("Import complete");
 
-						albums.refresh();
+					albums.refresh();
 
-						if (data==="Notice: Import only contains albums!") {
-							if (visible.albums()) lychee.load();
-							else lychee.goto("");
-						}
-						else if (album.getID()===false) lychee.goto("0");
-						else album.load(albumID);
+					if (data==="Notice: Import only contains albums!") {
+						if (visible.albums()) lychee.load();
+						else lychee.goto("");
+					}
+					else if (album.getID()===false) lychee.goto("0");
+					else album.load(albumID);
 
-						if (data==="Notice: Import only contains albums!") return true;
-						else if (data==="Warning: Folder empty!") lychee.error("Folder empty. No photos imported!", params, data);
-						else if (data!==true) lychee.error(null, params, data);
+					if (data==="Notice: Import only contains albums!") return true;
+					else if (data==="Warning: Folder empty!") lychee.error("Folder empty. No photos imported!", params, data);
+					else if (data!==true) lychee.error(null, params, data);
 
-					});
+				});
 
-				}],
-				["Cancel", function() {}]
-			];
+			}],
+			["Cancel", function() {}]
+		];
 
-			modal.show("Import from Server", "This action will import all photos, folders and sub-folders which are located in the following directory. The <b>original files will be deleted</b> after the import when possible. <input class='text' type='text' maxlength='100' placeholder='Absolute path to directory' value='" + lychee.location + "uploads/import/'>", buttons);
+		modal.show("Import from Server", "This action will import all photos, folders and sub-folders which are located in the following directory. The <b>original files will be deleted</b> after the import when possible. <input class='text' type='text' maxlength='100' placeholder='Absolute path to directory' value='" + lychee.location + "uploads/import/'>", buttons);
 
-		},
+	},
 
-		dropbox: function() {
+	dropbox: function() {
 
-			var albumID = album.getID(),
-				params,
-				links = "";
+		var albumID = album.getID(),
+			params,
+			links = "";
 
-			if (albumID===false) albumID = 0;
+		if (albumID===false) albumID = 0;
 
-			lychee.loadDropbox(function() {
-				Dropbox.choose({
-					linkType: "direct",
-					multiselect: true,
-					success: function(files) {
+		lychee.loadDropbox(function() {
+			Dropbox.choose({
+				linkType: "direct",
+				multiselect: true,
+				success: function(files) {
 
-						for (var i = 0; i < files.length; i++) {
+					for (var i = 0; i < files.length; i++) {
 
-							links += files[i].link + ",";
+						links += files[i].link + ",";
 
-							files[i] = {
-								name: files[i].link,
-								supported: true
-							};
+						files[i] = {
+							name: files[i].link,
+							supported: true
+						};
 
-						}
+					}
 
-						// Remove last comma
-						links = links.substr(0, links.length-1);
+					// Remove last comma
+					links = links.substr(0, links.length-1);
 
-						upload.show("Importing from Dropbox", files, function() {
-							$(".upload_message .rows .row .status").html("Importing");
-						});
+					upload.show("Importing from Dropbox", files, function() {
+						$(".upload_message .rows .row .status").html("Importing");
+					});
 
-						params = "importUrl&url=" + escape(links) + "&albumID=" + albumID;
-						lychee.api(params, function(data) {
+					params = "importUrl&url=" + escape(links) + "&albumID=" + albumID;
+					lychee.api(params, function(data) {
 
-							upload.close();
-							upload.notify("Import complete");
+						upload.close();
+						upload.notify("Import complete");
 
-							albums.refresh();
+						albums.refresh();
 
-							if (album.getID()===false) lychee.goto("0");
-							else album.load(albumID);
+						if (album.getID()===false) lychee.goto("0");
+						else album.load(albumID);
 
-							if (data!==true) lychee.error(null, params, data);
+						if (data!==true) lychee.error(null, params, data);
 
-						});
+					});
 
-					}
-				});
+				}
 			});
+		});
 
-		}
-
-	},
+	}
 
-	close: function(force) {
+}
 
-		if (force===true) {
-			$(".upload_overlay").remove();
-		} else {
-			$(".upload_overlay").removeClass("fadeIn").css("opacity", 0);
-			setTimeout(function() { $(".upload_overlay").remove() }, 300);
-		}
+upload.close = function(force) {
 
+	if (force===true) {
+		$(".upload_overlay").remove();
+	} else {
+		$(".upload_overlay").removeClass("fadeIn").css("opacity", 0);
+		setTimeout(function() { $(".upload_overlay").remove() }, 300);
 	}
 
-};
+}