From 7e06d0df30af18219d8b35e07634c08494adef32 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Mon, 25 Nov 2013 19:30:02 -0500
Subject: Changement de syntaxe pour être conforme à la norme utilisée
 ailleurs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/main.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'public')

diff --git a/public/scripts/main.js b/public/scripts/main.js
index bc40e4879..3077d611a 100644
--- a/public/scripts/main.js
+++ b/public/scripts/main.js
@@ -1,18 +1,7 @@
 "use strict";
 var $stream = null;
 
-// Create a new object to store FreshRSS methods and variables.
-// It will prevent over-riding other libraries methods and variables.
-var FreshRSS = {};
-FreshRSS.isCollapsed = true;
-
-FreshRSS.Entry = {};
-
-// Toggle the collapse flag
-FreshRSS.Entry.toggleCollapse = function() {
-	FreshRSS.isCollapsed = !FreshRSS.isCollapsed;
-	$(".flux.current").toggleClass("active");
-};
+var isCollapsed = true;
 
 function is_normal_mode() {
 	return $stream.hasClass('normal');
@@ -158,7 +147,7 @@ function toggleContent(new_active, old_active) {
 
 	old_active.removeClass("active").removeClass("current");
 	if (old_active[0] !== new_active[0]) {
-		if (FreshRSS.isCollapsed) {
+		if (isCollapsed) {
 			new_active.addClass("active");
 		};
 		new_active.addClass("current");
@@ -229,6 +218,11 @@ function next_entry() {
 	}
 }
 
+function collapse_entry() {
+	isCollapsed = !isCollapsed;
+	$(".flux.current").toggleClass("active");
+};
+
 function inMarkViewport(flux, box_to_follow, relative_follow) {
 	var top = flux.position().top;
 	if (relative_follow) {
@@ -343,7 +337,7 @@ function init_shortcuts() {
 		'disable_in_input': true
 	});
 	shortcut.add(shortcuts.collapse_entry, function () {
-		FreshRSS.Entry.toggleCollapse();
+		collapse_entry();
 	}, {
 		'disable_in_input': true
 	});
-- 
cgit v1.2.3