aboutsummaryrefslogtreecommitdiff
path: root/public/scripts
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-26 18:44:03 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-26 18:44:03 +0100
commit3be56f08b6f8fc7061780d071cbc6afe386eb6de (patch)
tree2555fed76ce183ce86399aab0f6fd5304c1b575a /public/scripts
parent80a1a228d48cd3fd373604a71e9f1e3604072bf2 (diff)
JS : Léger JSLint
Quelques corrections mineures suite à https://github.com/marienfressinaud/FreshRSS/pull/291 plus autres détails JS
Diffstat (limited to 'public/scripts')
-rw-r--r--public/scripts/main.js23
1 files changed, 12 insertions, 11 deletions
diff --git a/public/scripts/main.js b/public/scripts/main.js
index 3077d611a..d54937600 100644
--- a/public/scripts/main.js
+++ b/public/scripts/main.js
@@ -1,7 +1,6 @@
"use strict";
-var $stream = null;
-
-var isCollapsed = true;
+var $stream = null,
+ isCollapsed = true;
function is_normal_mode() {
return $stream.hasClass('normal');
@@ -149,7 +148,7 @@ function toggleContent(new_active, old_active) {
if (old_active[0] !== new_active[0]) {
if (isCollapsed) {
new_active.addClass("active");
- };
+ }
new_active.addClass("current");
}
@@ -221,7 +220,7 @@ 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;
@@ -516,7 +515,9 @@ function load_more_posts() {
$('[id^=day_]').each(function (i) {
var ids = $('[id="' + this.id + '"]');
- if (ids.length > 1) $('[id="' + this.id + '"]:gt(0)').remove();
+ if (ids.length > 1) {
+ $('[id="' + this.id + '"]:gt(0)').remove();
+ }
});
init_load_more(box_load_more);
@@ -583,16 +584,16 @@ function init_persona() {
url: url_login,
data: {assertion: assertion},
success: function(res, status, xhr) {
- var res_obj = jQuery.parseJSON(res);
+ var res_obj = $.parseJSON(res);
- if (res_obj.status == 'failure') {
- //alert (res_obj.reason);
- } else if (res_obj.status == 'okay') {
+ /*if (res_obj.status === 'failure') {
+ alert (res_obj.reason);
+ } else*/ if (res_obj.status === 'okay') {
location.href = url_freshrss;
}
},
error: function(res, status, xhr) {
- alert("login failure : " + res);
+ alert("Login failure: " + res);
}
});
},