diff options
| author | Rhenium <rhenium@rhe.jp> | 2013-08-08 08:13:20 +0900 |
|---|---|---|
| committer | Rhenium <rhenium@rhe.jp> | 2013-08-08 08:13:20 +0900 |
| commit | a4d982936788213f295e74b16189df15880c9e53 (patch) | |
| tree | 2f0e86b7cbd5214d4f7e15fb5decc70c7eddf23f | |
| parent | 45495a6df59e765c2ea9ad190604eee8d574670b (diff) | |
| download | aclog-a4d982936788213f295e74b16189df15880c9e53.tar.gz | |
fix showing pagination
| -rw-r--r-- | app/assets/javascripts/tweets.js | 2 | ||||
| -rw-r--r-- | app/views/tweets/_tweets.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/tweets.js b/app/assets/javascripts/tweets.js index 20bab9f..dbf0296 100644 --- a/app/assets/javascripts/tweets.js +++ b/app/assets/javascripts/tweets.js @@ -1,6 +1,6 @@ //= require html-autoload $(function() { -// $(".pagination").hide(); + $(".pagination").hide(); $.autopager({ content: $(".tweets"), nextUrl: $("a[rel=next]").attr("href"), diff --git a/app/views/tweets/_tweets.html.haml b/app/views/tweets/_tweets.html.haml index 63c802c..b8a92a0 100644 --- a/app/views/tweets/_tweets.html.haml +++ b/app/views/tweets/_tweets.html.haml @@ -1,5 +1,5 @@ .tweets= render partial: "tweets/tweet", collection: @tweets.includes(:user), as: :tweet -- if @tweets.count > 0 +- if @tweets.count > 0 && params[:action] != "show" .loading= image_tag "loading.gif", alt: "loading...", title: nil .pagination - if params[:page] |