From e83a3063d16e4095417fe8a39e48789d39a1ef4c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 17 Mar 2013 11:58:01 +0100
Subject: Suppression de l'effet de slide lors du parcours des articles
 (passage au système de Google Reader)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/javascript/main.phtml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'app/views/javascript')

diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index d2bde2a42..bae7cdcc5 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -24,16 +24,12 @@ function slide (new_active, old_active) {
 	new_active.addClass ("active");
 
 	if (hide_posts) {
-		old_active.children (".content").slideUp (500);
-		new_active.children (".content").slideDown (500, function () {
-			$.smoothScroll({
-				offset: new_active.position ().top
-			});
+		old_active.children (".content").toggle (0);
+		new_active.children (".content").toggle (0, function () {
+			$("html,body").scrollTop (new_active.position ().top);
 		});
 	} else {
-		$.smoothScroll({
-			offset: new_active.position ().top
-		});
+		$("html,body").scrollTop (new_active.position ().top);
 	}
 
 	<?php if ($mark['article'] == 'yes') { ?>
@@ -53,6 +49,7 @@ function mark_read (active, only_not_read) {
 
 	url =  active.find ("a.read").attr ("href");
 	if (url === undefined) {
+		load = false;
 		return false;
 	}
 
@@ -75,12 +72,16 @@ function mark_read (active, only_not_read) {
 }
 
 function mark_favorite (active) {
-	if (active[0] === undefined) {
+	if (active[0] === undefined ||
+	    load === true) {
 		return false;
 	}
 
+	load = true;
+
 	url =  active.find ("a.bookmark").attr ("href");
 	if (url === undefined) {
+		load = false;
 		return false;
 	}
 
@@ -97,6 +98,8 @@ function mark_favorite (active) {
 		} else {
 			active.addClass ("favorite");
 		}
+
+		load = false;
 	});
 }
 
@@ -119,7 +122,7 @@ function init_posts () {
 	init_img ();
 
 	if (hide_posts) {
-		$(".flux:not(.active) .content").slideUp ();
+		$(".flux:not(.active) .content").hide ();
 	}
 
 	$(".flux").click (function () {
@@ -206,7 +209,8 @@ $(document).ready (function () {
 
 		if (new_active.hasClass("flux")) {
 			slide (new_active, old_active);
-		} else if (new_active[0] === undefined) {
+		} else if (old_active[0] === undefined &&
+		           new_active[0] === undefined) {
 			slide (last_active, old_active);
 		}
 	}, {
@@ -229,7 +233,8 @@ $(document).ready (function () {
 
 		if (new_active.hasClass("flux")) {
 			slide (new_active, old_active);
-		} else if (new_active[0] === undefined) {
+		} else if (old_active[0] === undefined &&
+		           new_active[0] === undefined) {
 			slide (first_active, old_active);
 		}
 	}, {
-- 
cgit v1.2.3