From 88874750baed8bd5f2db978f0df637f3ac8a84fe Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 22 Nov 2014 20:09:38 +0100
Subject: [PATCH] Front-end rewrite #275

---
 dist/main.js        | Bin 170197 -> 170155 bytes
 src/scripts/init.js | 138 ++++++++++++++++++++++----------------------
 2 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 48467346740ed50ec1950612fa026bb64255ec8b..5eee85d61f6364cbe75d09e5389546640e735925 100644
GIT binary patch
delta 134
zcmcb*k!$rvu7)j)CcCy@+{LKEINf9y<C5)vb~73?3YKN2mg{BarR68(SLhXI<d;wP
z+si14MYwG*<Amu;_A!=B7uv_zH(g>sV;icfjLekO?R)n#F6EsrewI;S`kb?jn$uIy
NGOBMsbe2*0GyschHuL}h

delta 120
zcmV-;0Ehppu?p3(3V^f$G`g2qy8)!PJGucK0hi9Y0SCAIy8$x+ms`963zy-<0Th=&
zy#W~uW_503bZKvHC@FiF;lu$H0x2w)5L*Hjmw~+jd6#m&0g9LQy#aWa{JsH(mr7&;
aAGedg0i_L>Zp{HImpIJ<Ik%h50T9cL+%Vw)

diff --git a/src/scripts/init.js b/src/scripts/init.js
index 7f8bc4a..1d4839d 100755
--- a/src/scripts/init.js
+++ b/src/scripts/init.js
@@ -3,7 +3,7 @@
  * @copyright	2014 by Tobias Reich
  */
 
-$(document).ready(function(){
+$(document).ready(function() {
 
 	/* Event Name */
 	var event_name = (mobileBrowser()) ? "touchend" : "click";
@@ -12,29 +12,31 @@ $(document).ready(function(){
 	$(document).bind("contextmenu", function(e) { e.preventDefault() });
 
 	/* Multiselect */
-	$("#content").on("mousedown", multiselect.show);
-	$(document).on("mouseup", multiselect.getSelection);
+	$("#content")	.on("mousedown",	multiselect.show);
+	$(document)		.on("mouseup",		multiselect.getSelection);
 
 	/* Header */
-	$("#hostedwith").on(event_name, function() { window.open(lychee.website) });
-	$("#button_signin").on(event_name, lychee.loginDialog);
-	$("#button_settings").on(event_name, contextMenu.settings);
 	$("#button_share").on(event_name, function(e) {
-		if (photo.json.public==1||photo.json.public==2) contextMenu.sharePhoto(photo.getID(), e);
-		else photo.setPublic(photo.getID(), e);
+		if (photo.json.public==1||photo.json.public==2)	contextMenu.sharePhoto(photo.getID(), e);
+		else											photo.setPublic(photo.getID(), e);
 	});
 	$("#button_share_album").on(event_name, function(e) {
-		if (album.json.public==1) contextMenu.shareAlbum(album.getID(), e);
-		else album.setPublic(album.getID(), e);
+		if (album.json.public==1)	contextMenu.shareAlbum(album.getID(), e);
+		else						album.setPublic(album.getID(), e);
 	});
-	$("#button_more").on(event_name, function(e) { contextMenu.photoMore(photo.getID(), e) });
-	$("#button_trash_album").on(event_name, function() { album.delete([album.getID()]) });
-	$("#button_move").on(event_name, function(e) { contextMenu.move([photo.getID()], e) });
-	$("#button_trash").on(event_name, function() { photo.delete([photo.getID()]) });
-	$("#button_info_album").on(event_name, function() { view.infobox.show() });
-	$("#button_info").on(event_name, function() { view.infobox.show() });
-	$("#button_archive").on(event_name, function() { album.getArchive(album.getID()) });
-	$("#button_star").on(event_name, function() { photo.setStar([photo.getID()]) });
+	$("#hostedwith")			.on(event_name, function() { window.open(lychee.website) });
+	$("#button_signin")			.on(event_name, lychee.loginDialog);
+	$("#button_settings")		.on(event_name, contextMenu.settings);
+	$("#button_more")			.on(event_name, function(e) { contextMenu.photoMore(photo.getID(), e) });
+	$("#button_trash_album")	.on(event_name, function() { album.delete([album.getID()]) });
+	$("#button_move")			.on(event_name, function(e) { contextMenu.move([photo.getID()], e) });
+	$("#button_trash")			.on(event_name, function() { photo.delete([photo.getID()]) });
+	$("#button_info_album")		.on(event_name, view.infobox.show);
+	$("#button_info")			.on(event_name, view.infobox.show);
+	$("#button_archive")		.on(event_name, function() { album.getArchive(album.getID()) });
+	$("#button_star")			.on(event_name, function() { photo.setStar([photo.getID()]) });
+	$("#button_back_home")		.on(event_name, function() { lychee.goto("") });
+	$("#button_back")			.on(event_name, function() { lychee.goto(album.getID()) });
 
 	/* Search */
 	$("#search").on("keyup click", function() { search.find($(this).val()) });
@@ -45,30 +47,26 @@ $(document).ready(function(){
 		search.reset();
 	});
 
-	/* Back Buttons */
-	$("#button_back_home").on(event_name, function() { lychee.goto("") });
-	$("#button_back").on(event_name, function() { lychee.goto(album.getID()) });
-
 	/* Image View */
 	lychee.imageview
-		.on(event_name, ".arrow_wrapper.previous", photo.previous)
-		.on(event_name, ".arrow_wrapper.next", photo.next);
+		.on(event_name, ".arrow_wrapper.previous",	photo.previous)
+		.on(event_name, ".arrow_wrapper.next",		photo.next);
 
 	/* Infobox */
 	$("#infobox")
-		.on(event_name, ".header a", function() { view.infobox.hide() })
-		.on(event_name, "#edit_title_album", function() { album.setTitle([album.getID()]) })
-		.on(event_name, "#edit_description_album", function() { album.setDescription(album.getID()) })
-		.on(event_name, "#edit_title", function() { photo.setTitle([photo.getID()]) })
-		.on(event_name, "#edit_description", function() { photo.setDescription(photo.getID()) })
-		.on(event_name, "#edit_tags", function() { photo.editTags([photo.getID()]) })
-		.on(event_name, "#tags .tag span", function() { photo.deleteTag(photo.getID(), $(this).data('index')) });
+		.on(event_name, ".header a",				view.infobox.hide)
+		.on(event_name, "#edit_title_album",		function() { album.setTitle([album.getID()]) })
+		.on(event_name, "#edit_description_album",	function() { album.setDescription(album.getID()) })
+		.on(event_name, "#edit_title",				function() { photo.setTitle([photo.getID()]) })
+		.on(event_name, "#edit_description",		function() { photo.setDescription(photo.getID()) })
+		.on(event_name, "#edit_tags",				function() { photo.editTags([photo.getID()]) })
+		.on(event_name, "#tags .tag span",			function() { photo.deleteTag(photo.getID(), $(this).data('index')) });
 
 	/* Keyboard */
 	Mousetrap
-		.bind('left', function() { if (visible.photo()) $("#imageview a#previous").click() })
-		.bind('right', function() { if (visible.photo()) $("#imageview a#next").click() })
-		.bind(['u', 'ctrl+u'], function() { $("#upload_files").click() })
+		.bind('left',			function() { if (visible.photo()) $("#imageview a#previous").click() })
+		.bind('right',			function() { if (visible.photo()) $("#imageview a#next").click() })
+		.bind(['u', 'ctrl+u'],	function() { $("#upload_files").click() })
 		.bind(['s', 'ctrl+s', 'f', 'ctrl+f'], function(e) {
 			if (visible.photo()) {
 				$("#button_star").click();
@@ -79,13 +77,13 @@ $(document).ready(function(){
 		})
 		.bind(['r', 'ctrl+r'], function(e) {
 			e.preventDefault();
-			if (visible.album()) album.setTitle(album.getID());
-			else if (visible.photo()) photo.setTitle([photo.getID()]);
+			if (visible.album())		album.setTitle(album.getID());
+			else if (visible.photo())	photo.setTitle([photo.getID()]);
 		})
 		.bind(['d', 'ctrl+d'], function(e) {
 			e.preventDefault();
-			if (visible.photo()) photo.setDescription(photo.getID());
-			else if (visible.album()) album.setDescription(album.getID());
+			if (visible.photo())		photo.setDescription(photo.getID());
+			else if (visible.album())	album.setDescription(album.getID());
 		})
 		.bind(['t', 'ctrl+t'], function(e) {
 			if (visible.photo()) {
@@ -94,17 +92,17 @@ $(document).ready(function(){
 			}
 		})
 		.bind(['i', 'ctrl+i'], function() {
-			if (visible.infobox()) view.infobox.hide();
-			else if (visible.multiselect()) return false;
-			else if (visible.infoboxbutton()) view.infobox.show();
+			if (visible.infobox())				view.infobox.hide();
+			else if (visible.multiselect())		return false;
+			else if (visible.infoboxbutton())	view.infobox.show();
 		})
 		.bind(['command+backspace', 'ctrl+backspace'], function() {
-			if (visible.photo()&&!visible.message()) photo.delete([photo.getID()]);
-			else if (visible.album()&&!visible.message()) album.delete([album.getID()]);
+			if (visible.photo()&&!visible.message())		photo.delete([photo.getID()]);
+			else if (visible.album()&&!visible.message())	album.delete([album.getID()]);
 		})
 		.bind(['command+a', 'ctrl+a'], function() {
-			if (visible.album()&&!visible.message()) multiselect.selectAll();
-			else if (visible.albums()&&!visible.message()) multiselect.selectAll();
+			if (visible.album()&&!visible.message())		multiselect.selectAll();
+			else if (visible.albums()&&!visible.message())	multiselect.selectAll();
 		});
 
 	Mousetrap.bindGlobal('enter', function() {
@@ -113,12 +111,12 @@ $(document).ready(function(){
 
 	Mousetrap.bindGlobal(['esc', 'command+up'], function(e) {
 		e.preventDefault();
-		if (visible.message()&&$(".message .close").length>0) modal.close();
-		else if (visible.contextMenu()) contextMenu.close();
-		else if (visible.infobox()) view.infobox.hide();
-		else if (visible.photo()) lychee.goto(album.getID());
-		else if (visible.album()) lychee.goto("");
-		else if (visible.albums()&&$("#search").val().length!==0) search.reset();
+		if (visible.message()&&$(".message .close").length>0)		modal.close();
+		else if (visible.contextMenu())								contextMenu.close();
+		else if (visible.infobox())									view.infobox.hide();
+		else if (visible.photo())									lychee.goto(album.getID());
+		else if (visible.album())									lychee.goto("");
+		else if (visible.albums()&&$("#search").val().length!==0)	search.reset();
 	});
 
 
@@ -129,15 +127,15 @@ $(document).ready(function(){
 			/* Fullscreen on mobile */
 			.on('touchend', '#image', function(e) {
 				if (swipe.obj===null||(swipe.offset>=-5&&swipe.offset<=5)) {
-					if (visible.controls()) view.header.hide(e, 0);
-					else view.header.show();
+					if (visible.controls())	view.header.hide(e, 0);
+					else					view.header.show();
 				}
 			})
 
 			/* Swipe on mobile */
-			.swipe().on('swipeStart', function() { if (visible.photo()) swipe.start($("#image")) })
-			.swipe().on('swipeMove', function(e) { if (visible.photo()) swipe.move(e.swipe) })
-			.swipe().on('swipeEnd', function(e) { if (visible.photo()) swipe.stop(e.swipe, photo.previous, photo.next) });
+			.swipe().on('swipeStart',	function() { if (visible.photo()) swipe.start($("#image")) })
+			.swipe().on('swipeMove',	function(e) { if (visible.photo()) swipe.move(e.swipe) })
+			.swipe().on('swipeEnd',		function(e) { if (visible.photo()) swipe.stop(e.swipe, photo.previous, photo.next) });
 
 	}
 
@@ -149,8 +147,8 @@ $(document).ready(function(){
 
 		/* Header */
 		.on(event_name, "#title.editable", function() {
-			if (visible.photo()) photo.setTitle([photo.getID()]);
-			else album.setTitle([album.getID()]);
+			if (visible.photo())	photo.setTitle([photo.getID()]);
+			else					album.setTitle([album.getID()]);
 		})
 
 		/* Navigation */
@@ -158,34 +156,34 @@ $(document).ready(function(){
 		.on("click", ".photo", function() { lychee.goto(album.getID() + "/" + $(this).attr("data-id")) })
 
 		/* Modal */
-		.on(event_name, ".message .close", modal.close)
-		.on(event_name, ".message .button:first", function() { if (modal.fns!==null) modal.fns[0](); if (!visible.signin()) modal.close() })
-		.on(event_name, ".message .button:last", function() { if (modal.fns!==null) modal.fns[1](); if (!visible.signin()) modal.close() })
+		.on(event_name, ".message .close",			modal.close)
+		.on(event_name, ".message .button:first",	function() { if (modal.fns!==null) modal.fns[0](); if (!visible.signin()) modal.close() })
+		.on(event_name, ".message .button:last",	function() { if (modal.fns!==null) modal.fns[1](); if (!visible.signin()) modal.close() })
 
 		/* Add Dialog */
 		.on(event_name, ".button_add", function(e) { contextMenu.add(e) })
 
 		/* Context Menu */
-		.on("contextmenu", ".photo", function(e) { contextMenu.photo(photo.getID(), e) })
-		.on("contextmenu", ".album", function(e) { contextMenu.album(album.getID(), e) })
-		.on(event_name, ".contextmenu_bg", contextMenu.close)
-		.on("contextmenu", ".contextmenu_bg", contextMenu.close)
+		.on("contextmenu", ".photo",			function(e) { contextMenu.photo(photo.getID(), e) })
+		.on("contextmenu", ".album",			function(e) { contextMenu.album(album.getID(), e) })
+		.on("contextmenu", ".contextmenu_bg",	contextMenu.close)
+		.on(event_name, ".contextmenu_bg",		contextMenu.close)
 
 		/* Infobox */
 		.on(event_name, "#infobox_overlay", view.infobox.hide)
 
 		/* Upload */
-		.on("change", "#upload_files", function() { modal.close(); upload.start.local(this.files) })
-		.on(event_name, ".upload_message a.close", upload.close)
-		.on("dragover", function(e) { e.preventDefault(); }, false)
+		.on("change", "#upload_files",				function() { modal.close(); upload.start.local(this.files) })
+		.on(event_name, ".upload_message a.close",	upload.close)
+		.on("dragover",								function(e) { e.preventDefault(); }, false)
 		.on("drop", function(e) {
 
 			e.stopPropagation();
 			e.preventDefault();
 
 			// Close open overlays or views which are correlating with the upload
-			if (visible.photo()) lychee.goto(album.getID());
-			if (visible.contextMenu()) contextMenu.close();
+			if (visible.photo())		lychee.goto(album.getID());
+			if (visible.contextMenu())	contextMenu.close();
 
 			// Detect if dropped item is a file or a link
 			if (e.originalEvent.dataTransfer.files.length>0)				upload.start.local(e.originalEvent.dataTransfer.files);