Small code adjustments #232

README

@@ -1,9 +0,0 @@
-Experimental fork of Lychee, a photo management system, that features a number of improvements, including:
-
-* Faster photo browsing thanks to caching.
-* Default sort order of albums is changed from new to old.
-* Preserves scroll position when changing from albums to album and vice versa
-* Better Unicode support for values read from the database
-
-
-See http://github.com/electerious/Lychee for more details on Lychee

assets/js/album.js

@@ -116,8 +116,9 @@ album = {
 					if (data!==false&&isNumber(data)) {
 						albums.refresh();
 						lychee.goto(data);
+					} else {
+						lychee.error(null, params, data);
 					}
-					else lychee.error(null, params, data);
 
 				});
 
@@ -149,7 +150,7 @@ album = {
 						albumIDs.forEach(function(id) {
 							albums.json.num--;
 							view.albums.content.delete(id);
-							delete albums.json.content[id]
+							delete albums.json.content[id];
 						});
 
 					} else lychee.goto("");

assets/js/albums.js

@@ -20,8 +20,8 @@ albums = {
 
 		startTime = new Date().getTime();
 
+		if(albums.json===null) {
 
-		if(albums.json == null) {
 			lychee.api("getAlbums", function(data) {
 
 				/* Smart Albums */
@@ -76,13 +76,17 @@ albums = {
 					view.header.mode("albums");
 					view.albums.init();
 					lychee.animate(".album:nth-child(-n+50), .photo:nth-child(-n+50)", "contentZoomIn");
-	
 				}, waitTime);
 			});
+
 		} else {
+
+			setTimeout(function() {
 				view.header.mode("albums");
 				view.albums.init();
 				lychee.animate(".album:nth-child(-n+50), .photo:nth-child(-n+50)", "contentZoomIn");
+			}, 300);
+
 		}
 	},
 
@@ -101,7 +105,9 @@ albums = {
 	},
 
 	refresh: function() {
+
 		albums.json = null;
+
 	}
 
 };

assets/js/build.js

@@ -34,7 +34,7 @@ build = {
 			title = albumJSON.title,
 			typeThumb = "";
 
-		if (title != null && title.length>18) {
+		if (title!==null&&title.length>18) {
 			title = albumJSON.title.substr(0, 18) + "...";
 			longTitle = albumJSON.title;
 		}
@@ -76,7 +76,7 @@ build = {
 			longTitle = "",
 			title = photoJSON.title;
 
-		if (title != null && title.length>18) {
+		if (title!==null&&title.length>18) {
 			title = photoJSON.title.substr(0, 18) + "...";
 			longTitle = photoJSON.title;
 		}

assets/js/lychee.js

@@ -181,7 +181,6 @@ var lychee = {
 		if (albumID&&photoID) {
 
 			// Trash data
-			//albums.json = null;
 			photo.json = null;
 
 			// Show Photo
@@ -195,7 +194,6 @@ var lychee = {
 		} else if (albumID) {
 
 			// Trash data
-			//albums.json = null;
 			photo.json = null;
 
 			// Show Album
@@ -206,7 +204,6 @@ var lychee = {
 		} else {
 
 			// Trash data
-			//albums.json = null;
 			album.json = null;
 			photo.json = null;
 			search.code = "";

assets/js/photo.js

@@ -5,10 +5,10 @@
  * @copyright	2014 by Tobias Reich
  */
 
-cache = null;
 photo = {
 
 	json: null,
+	cache: null,
 
 	getID: function() {
 
@@ -52,16 +52,23 @@ photo = {
 
 	//preload the next photo for better response time
 	preloadNext: function(photoID) {
-		if(album.json &&
+
+		var nextPhoto,
+			url;
+
+		if (album.json &&
 		   album.json.content &&
 		   album.json.content[photoID] &&
 		   album.json.content[photoID].nextPhoto!="") {
 
-			var nextPhoto    = album.json.content[photoID].nextPhoto;
+			nextPhoto	= album.json.content[photoID].nextPhoto;
-			var url   = album.json.content[nextPhoto].url; 
+			url			= album.json.content[nextPhoto].url;
-			cache     = new Image();
+
-			cache.src = url;
+			photo.cache		= new Image();
+			photo.cache.src	= url;
+
 		}
+
 	},
 
 	parse: function() {
@@ -341,14 +348,12 @@ photo = {
 		var params;
 
 		if (photo.json.public==2) {
+
 			modal.show("Public Album", "This photo is located in a public album. To make this photo private or public, edit the visibility of the associated album.", [["Show Album", function() { lychee.goto(photo.json.original_album) }], ["Close", function() {}]]);
 			return false;
 
 		}
 
-		albums.refresh();
-
-
 		if (visible.photo()) {
 
 			photo.json.public = (photo.json.public==0) ? 1 : 0;
@@ -367,6 +372,8 @@ photo = {
 
 		});
 
+		albums.refresh();
+
 	},
 
 	setDescription: function(photoID) {

assets/js/view.js

@@ -122,7 +122,7 @@ view = {
 
 		content: {
 
-			scroll_pos: 0,
+			scrollPosition: 0,
 
 			init: function() {
 
@@ -137,8 +137,8 @@ view = {
 				if (!lychee.publicMode) smartData = build.divider("Smart Albums") + build.album(albums.json.unsortedAlbum) + build.album(albums.json.starredAlbum) + build.album(albums.json.publicAlbum) + build.album(albums.json.recentAlbum);
 
 				/* Albums */
-					
 				if (albums.json.content) {
+
 					$.each(albums.json.content, function() {
 						albums.parse(this);
 
@@ -147,6 +147,7 @@ view = {
 					});
 
 					if (!lychee.publicMode) albumsData = build.divider("Albums") + albumsData;
+
 				}
 
 				if (smartData===""&&albumsData==="") {
@@ -158,9 +159,9 @@ view = {
 
 				$("img[data-type!='nonretina']").retina();
 
-				//restore scroll
+				/* Restore scroll position */
-				if (view.albums.content.scroll_pos != null) {
+				if (view.albums.content.scrollPosition!==null) {
-					$("html, body").scrollTop(view.albums.content.scroll_pos);
+					$("html, body").scrollTop(view.albums.content.scrollPosition);
 				}
 
 			},
@@ -172,7 +173,7 @@ view = {
 					title = albums.json.content[albumID].title;
 
 				if (albums.json.content[albumID].password) prefix = "<span class='icon-lock'></span> ";
-				if (title != null && title.length>18) {
+				if (title!==null&&title.length>18) {
 					longTitle = title;
 					title = title.substr(0, 18) + "...";
 				}
@@ -260,9 +261,10 @@ view = {
 
 				$("img[data-type!='svg']").retina();
 
-				view.albums.content.scroll_pos = $(document).scrollTop();
+				/* Save and reset scroll position */
-				//scroll to top
+				view.albums.content.scrollPosition = $(document).scrollTop();
 				$("html, body").scrollTop(0);
+
 			},
 
 			title: function(photoID) {
@@ -270,7 +272,7 @@ view = {
 				var longTitle = "",
 					title = album.json.content[photoID].title;
 
-				if (title != null && title.length>18) {
+				if (title!==null&&title.length>18) {
 					longTitle = title;
 					title = title.substr(0, 18) + "...";
 				}

build/gulpfile.js

@@ -31,7 +31,7 @@ gulp.task('view', function () {
 		.pipe(gulp.dest('../assets/min/'));
 
 });
-/*
+
 gulp.task('js', function () {
 
 	gulp.src(paths.js)
@@ -39,15 +39,6 @@ gulp.task('js', function () {
 		.pipe(plugins.uglify())
 		.pipe(gulp.dest('../assets/min/'));
 
-});
-*/
-
-gulp.task('js', function () {
-
-	gulp.src(paths.js)
-		.pipe(plugins.concat('main.js', {newLine: "\n"}))
-		.pipe(gulp.dest('../assets/min/'));
-
 });
 
 gulp.task('css', function () {

build/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {
     "gulp": "^3.8.8",
     "gulp-autoprefixer": "1.0.0",
-    "gulp-concat": "^2.4.0",
+    "gulp-concat": "^2.4.1",
     "gulp-load-plugins": "^0.6.0",
     "gulp-minify-css": "^0.3.8",
     "gulp-sass": "^0.7.3",

php/access/Admin.php

@@ -9,7 +9,6 @@
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 if (!defined('LYCHEE_ACCESS_ADMIN')) exit('Error: You are not allowed to access this area!');
 
-
 class Admin extends Access {
 
 	public function check($fn) {
@@ -74,6 +73,7 @@ class Admin extends Access {
 
 		$album = new Album($this->database, $this->plugins, $this->settings, null);
 		echo json_encode($album->getAll(false));
+
 	}
 
 	private function getAlbum() {

php/modules/Album.php

@@ -8,17 +8,6 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-
-function debug_to_console( $data ) {
-
-	if ( is_array( $data ) )
-		$output = "<script>console.log( 'Debug Objects: " . implode( ',', $data) . "' );</script>";
-	else
-		$output = "<script>console.log( 'Debug Objects: " . $data . "' );</script>";
-
-	echo $output;
-}
-
 class Album extends Module {
 
 	private $database	= null;
@@ -96,7 +85,6 @@ class Album extends Module {
 						$return = $albums->fetch_assoc();
 						$return['sysdate']	= date('d M. Y', $return['sysstamp']);
 						$return['password']	= ($return['password']=='' ? false : true);
-
 						$query	= Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
 						break;