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

---
 dist/view.js             | Bin 104955 -> 104898 bytes
 src/scripts/view/main.js |  71 ++++++++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/dist/view.js b/dist/view.js
index 024a2fb739d51c9b4a6659e0127a36bc6de90283..b475e0b879dc2a8225c5626348435a1649cf9314 100644
GIT binary patch
delta 1129
zcmYjPU1%It6y{8tU1`|t+BRvbn>9Nm+Zi)EO=C%u-HuE5wrW6yM6uX)ZKs*L-Pzg9
zY-aBM#B4-FXu*d*j4%YGpkf{rQ5kf_mqKYlv5HCs(dvs}q1D$YgjUaFt?kQq?>Xl?
zf8V{Ee(0hf`skAg5ckta1q?sge-zL-9X){fW^^ComFPI)-@)A%VuKtQZf?g6a+i0!
zhTL~<?*ugd*>$!L31>%ALwI~RJ&Ym$>zVa%oX9q<s!VUt0xe7wWwu<SMM+hxcAL28
z4qw9J&*syJujccZb2)z~Nac>a3q3?K{P&K&9qJ)Walcy|aJ47Dz+UO6#BInwHpdXJ
z%sq@~&JVhg`SCs?mvmE;XOBpCBa0ZnHou8Qe|)BYI~v!EA{zI<_yG>?UO4eF;?hYH
zGXy4PZOZDlIbyC##J_Yh6o~PaiXHq7HNxQ>qMNh^{kV3mH%jE1L+hI56lgKnC0wZ>
z&#vqWBsx>I(D<vG>%rq-?Pu;TT{c-+A#T!n0*hB18F9@S9SBCRGHN@@|Aldh@10=D
z$Jqre6RwYPXh_XC;%qaCXf)3x?h)8g)ULi_R@6&^P{%&8mVmi4t($?yW9vL;Fn8(p
zkgu*^&Y_rlfBzwPzgyQsSli!rBNnJXaPw;5yzvLO9gjaZGJKer%F3!_bmToShq2Bp
z4*(_-@3}Zk1L>TL!yXWb!kgBDWio0qKJ&=L0Yy=0Zp+ISEln@!RO2%O@xC2~RD?(Z
zZMTy|Or_A(lYq%M5yyF6s^`l1X&kHCpvQDp7D`fKK_cE<0(N6ZJpmea{3Zd>`@ryi
zO~G&Iy|@?NdXR`KxOP&QeDstkva)S8M@ZHb()%USd0Bw9VaywP3_jZ#AtEiXV$M{O
z6B*+D@;sc!Q2RJIT-d;&S<dh_UVt~S@asi*8r%F-1Rg23ieUDJNLP!c1rTF>WnH7Q
zX308bwLIN{v4Im-gW6SfnV0SjZ92gBIc2MPhdae!UvERTN2sSWINqOa;@7pBvQ?v|
zK)tIBrnkb(i`5|>&Q2Z-2J@!s@P0l>W6DZX*H}4|+%J`>e!9%?wtD9WQ+X?RXjJHy
z6}z?|rl%%QZ|03PAibN(-At50lvtONO0kaJz*qjS`<G38;jG8CAO)-=w?OAaYTK4A
mtZ39(u=N_#Ei*%<nrf?yPKHVNb~Vd%XvSRaeEt#~e&}CB2Y0&w

delta 1171
zcmaJ<TWB0r80Md(yCre6+e>0%H{0ykZfBawG>wHO8^^VoRt>0-C>Fb}cDr*nGkZ2O
zo1HV6TsER2wBSP?Mi>Gjs2D`?#-Qt4p|nu6ii!o%st<yNR`JOwlve*qq^&Q$eCNM>
z|MmQ5g2=TX^1(+jpx(!^3aCN4;|QQK6+eLZN_-#Ug?K;WU!fcbi7pOQFSm6Bx$|3J
zMD80mwgD=CZ$H(Jgj0Q)ZhYP!?nPJd`N(QCN##1J7MU?i@+3c4klB2V6r`eJH5$}g
zK6Dn7KRz~q_`=v2#+)0wHw@(tzX>f=QiHdTydG(xO!2;2>GZUR&tt8DN5od-ADv)`
z7bf;1nv-2#Y_h+d%4NgU<nhDOEzdOiFHK&<q~AW)(T2+9f{4nNr{BfKz0=Qph&Xdx
zO{fABN9%++b+gZ0l4x-DcqClLXGN?KtQBJ%_91#{t1C!qmo~+zT(gOzS$3Wj!daq~
z3i9fe?cs_}RxMQitmazqIavFiyG55xrYqD-+Ye##iY+6q*t<Hz)~k%vZRKWS9O7#`
z9P&YS8q-9bT^uTsn?xLU(}>hPnYwMkwo=^KuQ)0iWkGPTPGU~L*pa!b;f{B&@|?=N
znH$|farImdm$~Pci{bxWzZ}8bLF<)7xc$zn--O01zjAH({I-_mqtsLumn5|*_rL`D
zn$O(@7)bpmk}wRkxtxR^5U9eNR>?9MF&Uq|XYhccC?vOTWz&{slntWsS%Lar_Ch8`
zC4n>=X)0ziXlhBpP?C!MJTEyp9goJgs<Y&%!E~W4<x3LvCsJ@HRy0zeVZ|>}5Z?@{
z|6>MzM(de9@Y)V4F5=i}Vd%aSqR8~R<@V80QyADU(dM%Ptn^}B_XF_Bwip#jo)vPY
zk{--b|A!~xRdh9ufz3r#Y?|d%f9)xF856%$fJd>+cLm^)a=ifNrU>2G#Y_prL{Hf<
zOU$rLL0r@gjf|UR>x4BYh)cd<!*2gm8`}Pd^OFs{KggiH!`3bLw%|J$>}#zWCiU-U
zaBPd@;$d5^Y}JS<tef9rFub>9X+$A1CG#puxtmg!$gXabbZO`yjuW!{%?`ZdzqbI9
z9euX3K$Jz-(3qZ0@0WC9Oz8}zCCR_&z|Pjt@BiVzz&caj@Z+jPDfGzeftgGwH%Dgi
z9wN13y*O?A%Pt;+<ezsT^RKD-y9)+)ch#B_h$!J{;I9%nRM~%3v-$i29NPI0Xd#jQ

diff --git a/src/scripts/view/main.js b/src/scripts/view/main.js
index 55d4706..644d6d1 100644
--- a/src/scripts/view/main.js
+++ b/src/scripts/view/main.js
@@ -3,31 +3,31 @@
  * @copyright	2014 by Tobias Reich
  */
 
-var header = $('header'),
-	headerTitle = $('#title'),
-	imageview = $('#imageview'),
-	api_path = 'php/api.php',
-	infobox = $('#infobox');
+var header		= $('header'),
+	headerTitle	= $('#title'),
+	imageview	= $('#imageview'),
+	api_path	= 'php/api.php',
+	infobox		= $('#infobox');
 
 $(document).ready(function(){
 
 	/* Event Name */
-	if (mobileBrowser()) event_name = 'touchend';
-	else event_name = 'click';
+	if (mobileBrowser())	event_name = 'touchend';
+	else					event_name = 'click';
 
 	/* Window */
 	$(window).keydown(key);
 
 	/* Infobox */
-	$(document).on(event_name, '#infobox .header a', function() { hideInfobox() });
-	$(document).on(event_name, '#infobox_overlay', function() { hideInfobox() });
-	$('#button_info').on(event_name, function() { showInfobox() });
+	$(document)			.on(event_name, '#infobox .header a', hideInfobox);
+	$(document)			.on(event_name, '#infobox_overlay', hideInfobox);
+	$('#button_info')	.on(event_name, showInfobox);
 
 	/* Direct Link */
 	$('#button_direct').on(event_name, function() {
 
-		link = $('#imageview #image').css('background-image').replace(/"/g,'').replace(/url\(|\)$/ig, '');
-		window.open(link,'_newtab');
+		var link = $('#imageview #image').css('background-image').replace(/"/g,'').replace(/url\(|\)$/ig, '');
+		window.open(link, '_newtab');
 
 	});
 
@@ -37,30 +37,34 @@ $(document).ready(function(){
 
 key = function(e) {
 
-	code = (e.keyCode ? e.keyCode : e.which);
-	if (code===27&&visibleInfobox()) { hideInfobox(); e.preventDefault(); }
+	var code = (e.keyCode ? e.keyCode : e.which);
+
+	if (code===27&&visibleInfobox()) {
+		hideInfobox();
+		e.preventDefault();
+	}
 
 }
 
 visibleInfobox = function() {
 
-	if (parseInt(infobox.css('right').replace('px', ''))<0) return false;
-	else return true;
+	if (parseInt(infobox.css('right').replace('px', ''))<0)	return false;
+	else													return true;
 
 }
 
 isPhotoSmall = function(photo) {
 
-	size = {
-		width: false,
-		height: false
+	var size = {
+		width:	false,
+		height:	false
 	};
 
-	if (photo.width<$(window).width()-60) size.width = true;
-	if (photo.height<$(window).height()-100) size.height = true;
+	if (photo.width<$(window).width()-60)		size.width = true;
+	if (photo.height<$(window).height()-100)	size.height = true;
 
-	if (size.width&&size.height) return true;
-	else return false;
+	if (size.width&&size.height)	return true;
+	else							return false;
 
 }
 
@@ -81,7 +85,7 @@ hideInfobox = function() {
 
 loadPhotoInfo = function(photoID) {
 
-	params = 'function=getPhoto&photoID=' + photoID + '&albumID=0&password=""';
+	var params = 'function=getPhoto&photoID=' + photoID + '&albumID=0&password=""';
 	$.ajax({type: 'POST', url: api_path, data: params, dataType: 'json', success: function(data) {
 
 		if (!data.title) data.title = 'Untitled';
@@ -90,10 +94,13 @@ loadPhotoInfo = function(photoID) {
 
 		imageview.attr('data-id', photoID);
 
-		if (isPhotoSmall(data)) imageview.html("<div id='image' class='small' style='background-image: url(" + data.url + "); width: " + data.width + "px; height: " + data.height + "px; margin-top: -" + parseInt((data.height/2)-20) + "px; margin-left: -" + data.width/2 + "px;'></div>");
-		else imageview.html("<div id='image' style='background-image: url(" + data.url + ");'></div>");
+		if (isPhotoSmall(data))	imageview.html("<div id='image' class='small' style='background-image: url(" + data.url + "); width: " + data.width + "px; height: " + data.height + "px; margin-top: -" + parseInt((data.height/2)-20) + "px; margin-left: -" + data.width/2 + "px;'></div>");
+		else					imageview.html("<div id='image' style='background-image: url(" + data.url + ");'></div>");
 
-		imageview.removeClass('fadeOut').addClass('fadeIn').show();
+		imageview
+			.removeClass('fadeOut')
+			.addClass('fadeIn')
+			.show();
 
 		infobox.html(build.infoboxPhoto(data, true)).show();
 
@@ -101,10 +108,12 @@ loadPhotoInfo = function(photoID) {
 
 }
 
-ajaxError = function(jqXHR, textStatus, errorThrown) {
+ajaxError = function(errorThrown, params, data) {
 
-	console.log(jqXHR);
-	console.log(textStatus);
-	console.log(errorThrown);
+	console.error({
+		description:	errorThrown,
+		params:			params,
+		response:		data
+	});
 
 }
\ No newline at end of file