From 710aa2bf5281fd22e2d915f8cb30ab9965cae06c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 11 Jul 2015 16:17:28 +0200
Subject: [PATCH] Updated lychee.js (ES2015)

---
 dist/main.js          | Bin 179942 -> 179990 bytes
 src/scripts/lychee.js | 324 ++++++++++++++++++++----------------------
 2 files changed, 158 insertions(+), 166 deletions(-)
 mode change 100755 => 100644 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100755
new mode 100644
index 6fe25b764d1cd89092ea1703adf74e43b98985dd..c0e5848ee1deb17815731422535d07a3b79d7940
GIT binary patch
delta 311
zcmaF%muuQTu7(!IElhKnr_X0*l4G>qzK@w{DU+9Ns$OYvYEfQdZmLcmkW-LYTwI=C
zl%kVwTMd%1D$#)nS>@GQCl+Mt733F}Xeb4z78hsc=UG|h<fmumDe2@-U(d$m%vGXU
zo19pZoS~67{SO;c3ahPBOdjWSf&Gjk+{Kycd7gRdb|3-9DU71i^JXv#PhY^!Q~~Eo
zPq*b@3Kdj<0~`GUuzHXI)0cBFHSxiv6qKwp)22H_GKn*$PFIX(lAIpP$rQ@2SzVS`
zq);+_8z+;7gmqqNPL86jZHby%iC#`>UV2G}oq?K~#`JHTOgfAu)0MfHj2LUThjTGW
Yq%(3&cW7snoZeB$B(r^KA(Nvo0AxO2RsaA1

delta 257
zcmbRCkL%fAu7(!IElhKn8Lg+!VP=wN)Y-m=nQ1B0^a-I%tkeI*F^P$l*jASorxsb|
z=@cXu7nkQ3rC8<H>P(-&#w5j9GJQ20lQUPIW^Hm}Npglp$@Cv=Oexdv#WArdl-Mf8
z<Z*Ix+7u`x=KyuusuyRb=XvI-+ku5Sr*Cj$lA6APovDHus0zaK;9!d725QkSfGC=N
zfP<-L`i>l+LcLTV(ap&e%A%&Gkvjc3CzFPRPF`tFj-st?Do98#Cp9m<B*V@?O>Me5
q7n2TS>husUCL<<Io$c*hOcLqS9oiWsr|&Fel40c9ezlOv(H8(LHBBS{

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 1448ffb..908bd52 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -1,40 +1,38 @@
 /**
- * @description	This module provides the basic functions of Lychee.
- * @copyright	2015 by Tobias Reich
+ * @description This module provides the basic functions of Lychee.
+ * @copyright   2015 by Tobias Reich
  */
 
 lychee = {
 
-	title:			document.title,
-	version:		'3.0.3',
-	version_code:	'030003',
+	title           : document.title,
+	version         : '3.0.3',
+	version_code    : '030003',
 
-	update_path:	'http://lychee.electerious.com/version/index.php',
-	updateURL:		'https://github.com/electerious/Lychee',
-	website:		'http://lychee.electerious.com',
+	update_path     : 'http://lychee.electerious.com/version/index.php',
+	updateURL       : 'https://github.com/electerious/Lychee',
+	website         : 'http://lychee.electerious.com',
 
-	publicMode:		false,
-	viewMode:		false,
-	debugMode:		false,
+	publicMode      : false,
+	viewMode        : false,
+	debugMode       : false,
 
-	checkForUpdates:'1',
-	sortingPhotos:	'',
-	sortingAlbums:	'',
-	location:		'',
+	checkForUpdates : '1',
+	sortingPhotos   : '',
+	sortingAlbums   : '',
+	location        : '',
 
-	dropbox:		false,
-	dropboxKey:		'',
+	dropbox         : false,
+	dropboxKey      : '',
 
-	content:		$('#content'),
-	imageview:		$('#imageview')
+	content         : $('#content'),
+	imageview       : $('#imageview')
 
 }
 
 lychee.init = function() {
 
-	var params;
-
-	params = {
+	let params = {
 		version: lychee.version_code
 	}
 
@@ -49,52 +47,51 @@ lychee.init = function() {
 
 			// Logged in
 
-			lychee.sortingPhotos	= data.config.sortingPhotos		|| '';
-			lychee.sortingAlbums	= data.config.sortingAlbums		|| '';
-			lychee.dropboxKey		= data.config.dropboxKey		|| '';
-			lychee.location			= data.config.location			|| '';
-			lychee.checkForUpdates	= data.config.checkForUpdates	|| '1';
+			lychee.sortingPhotos   = data.config.sortingPhotos   || ''
+			lychee.sortingAlbums   = data.config.sortingAlbums   || ''
+			lychee.dropboxKey      = data.config.dropboxKey      || ''
+			lychee.location        = data.config.location        || ''
+			lychee.checkForUpdates = data.config.checkForUpdates || '1'
 
 			// Show dialog when there is no username and password
-			if (data.config.login===false) settings.createLogin();
+			if (data.config.login===false) settings.createLogin()
 
 		} else if (data.status===1) {
 
 			// Logged out
 
-			lychee.checkForUpdates = data.config.checkForUpdates || '1';
+			lychee.checkForUpdates = data.config.checkForUpdates || '1'
 
-			lychee.setMode('public');
+			lychee.setMode('public')
 
 		} else if (data.status===0) {
 
 			// No configuration
 
-			lychee.setMode('public');
+			lychee.setMode('public')
 
-			header.dom().hide();
-			lychee.content.hide();
-			$('body').append(build.no_content('cog'));
-			settings.createConfig();
+			header.dom().hide()
+			lychee.content.hide()
+			$('body').append(build.no_content('cog'))
+			settings.createConfig()
 
-			return true;
+			return true
 
 		}
 
-		$(window).bind('popstate', lychee.load);
-		lychee.load();
+		$(window).bind('popstate', lychee.load)
+		lychee.load()
 
-	});
+	})
 
 }
 
 lychee.login = function(data) {
 
-	var user		= data.username,
-		password	= data.password,
-		params;
+	let user     = data.username,
+	    password = data.password
 
-	params = {
+	let params = {
 		user,
 		password
 	}
@@ -104,34 +101,31 @@ lychee.login = function(data) {
 		if (data===true) {
 
 			// Use 'try' to catch a thrown error when Safari is in private mode
-			try { localStorage.setItem('lychee_username', user); }
+			try { localStorage.setItem('lychee_username', user) }
 			catch (err) {}
 
-			window.location.reload();
+			window.location.reload()
 
 		} else {
 
 			// Show error and reactive button
-			basicModal.error('password');
+			basicModal.error('password')
 
 		}
 
-	});
+	})
 
 }
 
 lychee.loginDialog = function() {
 
-	var localUsername,
-		msg = '';
-
-	msg =	`
-			<p class='signIn'>
-				<input class='text' name='username' autocomplete='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
-				<input class='text' name='password' autocomplete='current-password' type='password' value='' placeholder='password'>
-			</p>
-			<p class='version'>Lychee ${ lychee.version }<span> &#8211; <a target='_blank' href='${ lychee.updateURL }'>Update available!</a><span></p>
-			`
+	let msg = `
+	          <p class='signIn'>
+	              <input class='text' name='username' autocomplete='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
+	              <input class='text' name='password' autocomplete='current-password' type='password' value='' placeholder='password'>
+	          </p>
+	          <p class='version'>Lychee ${ lychee.version }<span> &#8211; <a target='_blank' href='${ lychee.updateURL }'>Update available!</a><span></p>
+	          `
 
 	basicModal.show({
 		body: msg,
@@ -145,95 +139,94 @@ lychee.loginDialog = function() {
 				fn: basicModal.close
 			}
 		}
-	});
+	})
 
 	if (localStorage) {
-		localUsername = localStorage.getItem('lychee_username');
-		if (localUsername!==null) {
-			if (localUsername.length>0) $('.basicModal input[name="username"]').val(localUsername);
-			$('.basicModal input[name="password"]').focus();
+		let localUsername = localStorage.getItem('lychee_username')
+		if (localUsername!==null && localUsername.length>0) {
+			$('.basicModal input[name="username"]').val(localUsername)
+			$('.basicModal input[name="password"]').focus()
 		}
 	}
 
-	if (lychee.checkForUpdates==='1') lychee.getUpdate();
+	if (lychee.checkForUpdates==='1') lychee.getUpdate()
 
 }
 
 lychee.logout = function() {
 
 	api.post('Session::logout', {}, function() {
-		window.location.reload();
-	});
+		window.location.reload()
+	})
 
 }
 
 lychee.goto = function(url) {
 
-	if (url===undefined)	url = '#';
-	else					url = '#' + url;
+	if (url===undefined) url = '#'
+	else                 url = '#' + url
 
-	history.pushState(null, null, url);
-	lychee.load();
+	history.pushState(null, null, url)
+	lychee.load()
 
 }
 
 lychee.load = function() {
 
-	var albumID	= '',
-		photoID	= '',
-		hash	= document.location.hash.replace('#', '').split('/');
+	let albumID = '',
+	    photoID = '',
+	    hash    = document.location.hash.replace('#', '').split('/')
 
-	$('.no_content').remove();
-	contextMenu.close();
-	multiselect.close();
+	$('.no_content').remove()
+	contextMenu.close()
+	multiselect.close()
 
-	if (hash[0]!==undefined) albumID = hash[0];
-	if (hash[1]!==undefined) photoID = hash[1];
+	if (hash[0]!==undefined) albumID = hash[0]
+	if (hash[1]!==undefined) photoID = hash[1]
 
-	if (albumID&&photoID) {
+	if (albumID && photoID) {
 
 		// Trash data
-		photo.json = null;
+		photo.json = null
 
 		// Show Photo
-		if (lychee.content.html()===''||
-			($('#search').length&&$('#search').val().length!==0)) {
-				lychee.content.hide();
-				album.load(albumID, true);
+		if (lychee.content.html()==='' || ($('#search').length && $('#search').val().length!==0)) {
+			lychee.content.hide()
+			album.load(albumID, true)
 		}
-		photo.load(photoID, albumID);
+		photo.load(photoID, albumID)
 
 	} else if (albumID) {
 
 		// Trash data
-		photo.json = null;
+		photo.json = null
 
 		// Hide sidebar
-		if (visible.sidebar()) sidebar.toggle();
+		if (visible.sidebar()) sidebar.toggle()
 
 		// Show Album
-		if (visible.photo()) view.photo.hide();
-		if (album.json&&albumID==album.json.id) view.album.title();
-		else album.load(albumID);
+		if (visible.photo()) view.photo.hide()
+		if (album.json && albumID==album.json.id) view.album.title()
+		else album.load(albumID)
 
 	} else {
 
 		// Trash albums.json when filled with search results
 		if (search.hash!==null) {
-			albums.json = null;
-			search.hash = null;
+			albums.json = null
+			search.hash = null
 		}
 
 		// Trash data
-		album.json = null;
-		photo.json = null;
+		album.json = null
+		photo.json = null
 
 		// Hide sidebar
-		if (visible.sidebar()) sidebar.toggle();
+		if (visible.sidebar()) sidebar.toggle()
 
 		// Show Albums
-		if (visible.photo()) view.photo.hide();
-		albums.load();
+		if (visible.photo()) view.photo.hide()
+		albums.load()
 
 	}
 
@@ -242,32 +235,32 @@ lychee.load = function() {
 lychee.getUpdate = function() {
 
 	$.ajax({
-		url: lychee.update_path,
-		success: function(data) { if (parseInt(data)>parseInt(lychee.version_code)) $('.version span').show(); }
-	});
+		url     : lychee.update_path,
+		success : function(data) { if (parseInt(data)>parseInt(lychee.version_code)) $('.version span').show() }
+	})
 
 }
 
 lychee.setTitle = function(title, editable) {
 
-	document.title = lychee.title + ' - ' + title;
+	document.title = lychee.title + ' - ' + title
 
-	header.setEditable(editable);
-	header.setTitle(title);
+	header.setEditable(editable)
+	header.setTitle(title)
 
 }
 
 lychee.setMode = function(mode) {
 
-	$('#button_settings, #button_settings, #button_search, #search, #button_trash_album, #button_share_album, .button_add, .button_divider').remove();
-	$('#button_trash, #button_move, #button_share, #button_star').remove();
+	$('#button_settings, #button_settings, #button_search, #search, #button_trash_album, #button_share_album, .button_add, .button_divider').remove()
+	$('#button_trash, #button_move, #button_share, #button_star').remove()
 
 	$(document)
-		.off('click',		'#title.editable')
-		.off('touchend',	'#title.editable')
-		.off('contextmenu',	'.photo')
-		.off('contextmenu',	'.album')
-		.off('drop');
+		.off('click',       '#title.editable')
+		.off('touchend',    '#title.editable')
+		.off('contextmenu', '.photo')
+		.off('contextmenu', '.album')
+		.off('drop')
 
 	Mousetrap
 		.unbind('u')
@@ -277,21 +270,21 @@ lychee.setMode = function(mode) {
 		.unbind('d')
 		.unbind('t')
 		.unbind(['command+backspace', 'ctrl+backspace'])
-		.unbind(['command+a', 'ctrl+a']);
+		.unbind(['command+a', 'ctrl+a'])
 
 	if (mode==='public') {
 
-		header.dom('#button_signin, #hostedwith').show();
-		lychee.publicMode = true;
+		header.dom('#button_signin, #hostedwith').show()
+		lychee.publicMode = true
 
 	} else if (mode==='view') {
 
-		Mousetrap.unbind(['esc', 'command+up']);
-		$('#button_back, a#next, a#previous').remove();
-		$('.no_content').remove();
+		Mousetrap.unbind(['esc', 'command+up'])
+		$('#button_back, a#next, a#previous').remove()
+		$('.no_content').remove()
 
-		lychee.publicMode	= true;
-		lychee.viewMode		= true;
+		lychee.publicMode = true
+		lychee.viewMode   = true
 
 	}
 
@@ -299,86 +292,85 @@ lychee.setMode = function(mode) {
 
 lychee.animate = function(obj, animation) {
 
-	var animations = [
+	let animations = [
 		['fadeIn', 'fadeOut'],
 		['contentZoomIn', 'contentZoomOut']
-	];
+	]
 
-	if (!obj.jQuery) obj = $(obj);
+	if (!obj.jQuery) obj = $(obj)
 
-	for (var i = 0; i < animations.length; i++) {
-		for (var x = 0; x < animations[i].length; x++) {
+	for (let i = 0; i < animations.length; i++) {
+		for (let x = 0; x < animations[i].length; x++) {
 			if (animations[i][x]==animation) {
-				obj.removeClass(animations[i][0] + ' ' + animations[i][1]).addClass(animation);
-				return true;
+				obj.removeClass(animations[i][0] + ' ' + animations[i][1]).addClass(animation)
+				return true
 			}
 		}
 	}
 
-	return false;
+	return false
 
 }
 
 lychee.escapeHTML = function(s) {
 
 	return s.replace(/&/g, '&amp;')
-			.replace(/"/g, '&quot;')
-			.replace(/</g, '&lt;')
-			.replace(/>/g, '&gt;');
+	        .replace(/"/g, '&quot;')
+	        .replace(/</g, '&lt;')
+	        .replace(/>/g, '&gt;')
 
 }
 
 lychee.retinize = function(path = '') {
 
-	var pixelRatio	= window.devicePixelRatio,
-		extention	= path.split('.').pop(),
-		hasRetina	= extention!=='svg';
+	let pixelRatio = window.devicePixelRatio,
+	    extention  = path.split('.').pop(),
+	    hasRetina  = extention!=='svg'
 
-	if ((pixelRatio!==undefined&&pixelRatio>1)&&
-		(hasRetina===true)) {
+	if ((pixelRatio!==undefined && pixelRatio>1) && hasRetina===true) {
 
-			path = path.replace(/\.[^/.]+$/, '');
-			path = path + '@2x' + '.' + extention;
+		path = path.replace(/\.[^/.]+$/, '')
+		path = path + '@2x' + '.' + extention
 
 	}
 
 	return {
 		path,
 		hasRetina
-	};
+	}
 
 }
 
 lychee.loadDropbox = function(callback) {
 
-	if (!lychee.dropbox&&lychee.dropboxKey) {
+	if (!lychee.dropbox && lychee.dropboxKey) {
 
-		loadingBar.show();
+		loadingBar.show()
 
-		var g = document.createElement('script'),
-			s = document.getElementsByTagName('script')[0];
+		let g = document.createElement('script'),
+		    s = document.getElementsByTagName('script')[0]
 
-		g.src	= 'https://www.dropbox.com/static/api/1/dropins.js';
-		g.id	= 'dropboxjs';
-		g.type	= 'text/javascript';
-		g.async = 'true';
-		g.setAttribute('data-app-key', lychee.dropboxKey);
+		g.src   = 'https://www.dropbox.com/static/api/1/dropins.js'
+		g.id    = 'dropboxjs'
+		g.type  = 'text/javascript'
+		g.async = 'true'
+		g.setAttribute('data-app-key', lychee.dropboxKey)
 		g.onload = g.onreadystatechange = function() {
-			var rs = this.readyState;
-			if (rs&&rs!=='complete'&&rs!=='loaded') return;
-			lychee.dropbox = true;
-			loadingBar.hide();
-			callback();
-		};
-		s.parentNode.insertBefore(g, s);
+			let rs = this.readyState
+			if (rs && rs!=='complete' && rs!=='loaded') return
+			lychee.dropbox = true
+			loadingBar.hide()
+			callback()
+		}
+		s.parentNode.insertBefore(g, s)
 
 	} else if (lychee.dropbox&&lychee.dropboxKey) {
 
-		callback();
+		callback()
 
 	} else {
 
-		settings.setDropboxKey(callback);
+		settings.setDropboxKey(callback)
 
 	}
 
@@ -386,32 +378,32 @@ lychee.loadDropbox = function(callback) {
 
 lychee.getEventName = function() {
 
-	let touchendSupport	= (/Android|iPhone|iPad|iPod/i).test(navigator.userAgent || navigator.vendor || window.opera) && ('ontouchend' in document.documentElement),
-		eventName		= (touchendSupport===true ? 'touchend' : 'click');
+	let touchendSupport = (/Android|iPhone|iPad|iPod/i).test(navigator.userAgent || navigator.vendor || window.opera) && ('ontouchend' in document.documentElement),
+	    eventName       = (touchendSupport===true ? 'touchend' : 'click')
 
-	return eventName;
+	return eventName
 
 }
 
 lychee.removeHTML = function(html = '') {
 
-	if (html==='') return html;
+	if (html==='') return html
 
-	var tmp = document.createElement('DIV');
-	tmp.innerHTML = html;
+	let tmp = document.createElement('DIV')
+	tmp.innerHTML = html
 
-	return tmp.textContent || tmp.innerText;
+	return (tmp.textContent || tmp.innerText)
 
 }
 
 lychee.error = function(errorThrown, params, data) {
 
 	console.error({
-		description:	errorThrown,
-		params:			params,
-		response:		data
-	});
+		description : errorThrown,
+		params      : params,
+		response    : data
+	})
 
-	loadingBar.show('error', errorThrown);
+	loadingBar.show('error', errorThrown)
 
 }
\ No newline at end of file