From 8b8295d61e321d2b4a9b1e39a179849b8d8aa602 Mon Sep 17 00:00:00 2001
From: Roman <roman@flowrl.com>
Date: Sun, 14 Sep 2014 15:36:23 +0300
Subject: [PATCH] New readme file

---
 CHANGELOG.md           | 9 ---------
 README                 | 5 +++++
 assets/min/main.js     | 9 +++++++++
 readme.md => lychme.md | 0
 4 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 CHANGELOG.md
 create mode 100644 README
 rename readme.md => lychme.md (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 4e9fb2e..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-CHANGES
-
-* Improved performance by caching:
-- The albums view is stored in memory when changing from the albums to the individual album/photo view.
-- When viewing photos, the next picture in the current album is preloaded.
-
-* Default sort order of albums is changed from new to old.
-
-* Fixed scroll position when changing from albums to album and vice versa
diff --git a/README b/README
new file mode 100644
index 0000000..67c599b
--- /dev/null
+++ b/README
@@ -0,0 +1,5 @@
+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
diff --git a/assets/min/main.js b/assets/min/main.js
index 10a12ae..a5574f6 100644
--- a/assets/min/main.js
+++ b/assets/min/main.js
@@ -3890,6 +3890,8 @@ view = {
 		},
 
 		content: {
+            
+            scroll_pos: 0,
 
 			init: function() {
 
@@ -3924,6 +3926,12 @@ view = {
 				}
 
 				$("img[data-type!='nonretina']").retina();
+                
+                //restore scroll
+                if (view.albums.content.scroll_pos != null) {
+                    //$("html, body").setanimate({ scrollTop: view.albums.content.scroll_pos }, "slow");
+                    $("html, body").scrollTop(view.albums.content.scroll_pos);
+                }
 
 			},
 
@@ -4022,6 +4030,7 @@ view = {
 
 				$("img[data-type!='svg']").retina();
                 
+                view.albums.content.scroll_pos = $(document).scrollTop();
                 //scroll to top
                 $("html, body").animate({ scrollTop: 0 }, "slow");
 
diff --git a/readme.md b/lychme.md
similarity index 100%
rename from readme.md
rename to lychme.md