diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-04-17 19:33:02 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-04-17 19:33:02 +0200 |
| commit | 592a34f0d21ff1b6d4bd8613052d2684df39d246 (patch) | |
| tree | 6c93b180bf271e32357bf1bad4baa93aa1233f5b /app/views/javascript/main.phtml | |
| parent | 044908439bdd7280f7539e12441d7dfa6c4d4c63 (diff) | |
| parent | a2b5e8f3ce597fbcec0c25b68c551a526d2bf3ec (diff) | |
Merge branch 'dev' into releases
Diffstat (limited to 'app/views/javascript/main.phtml')
| -rw-r--r-- | app/views/javascript/main.phtml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index 4f049e11d..e6c882333 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -26,10 +26,10 @@ function toggleContent (new_active, old_active) { } if (hide_posts) { - old_active.children (".content").toggle (0); + old_active.children (".flux_content").toggle (0); if (old_active[0] != new_active[0]) { - new_active.children (".content").toggle (0, function () { + new_active.children (".flux_content").toggle (0, function () { $("html,body").scrollTop (new_active.position ().top); }); } @@ -110,7 +110,7 @@ function mark_favorite (active) { function init_img () { $(".flux .content img").each (function () { - if ($(this).width () > ($("#stream").width()) / 2) { + if ($(this).width () > ($("#stream .content").width()) / 2) { $(this).addClass("big"); } }); @@ -127,7 +127,7 @@ function init_posts () { init_img (); if (hide_posts) { - $(".flux:not(.active) .content").hide (); + $(".flux:not(.active) .flux_content").hide (); } $(".flux_header .item.title, .flux_header .item.date").click (function () { |