From 59334dfaf53488a842cd3b690620f77e2a4f7b04 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Tue, 5 Apr 2011 16:18:04 -0700
Subject: [PATCH] Remove extra js, fix mobile view

---
 app/views/aspects/index.mobile.haml |  3 +--
 config/assets.yml                   |  1 -
 public/javascripts/mobile.js        | 22 ----------------------
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 public/javascripts/mobile.js

diff --git a/app/views/aspects/index.mobile.haml b/app/views/aspects/index.mobile.haml
index e4b068f36..ff1473093 100644
--- a/app/views/aspects/index.mobile.haml
+++ b/app/views/aspects/index.mobile.haml
@@ -12,8 +12,7 @@
   = link_to t('.post_a_message'), '#publisher_page', :id => 'publisher_button'
 #main_stream.stream
   = render 'shared/stream', :posts => @fakes
-  %a.more-link.paginate{:href => '#'}
+  %a.more-link.paginate{:href => aspects_path(:a_ids => params[:a_ids], :page => params[:page] + 1)}
     %h2= t("more")
-= will_paginate @posts
 - content_for :subpages do
   = render 'shared/publisher', :aspect_ids => @aspect_ids
diff --git a/config/assets.yml b/config/assets.yml
index 65c3911a6..d74f73d53 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -40,7 +40,6 @@ javascripts:
     - public/javascripts/vendor/jquery.infinitescroll.min.js
     - public/javascripts/diaspora.js
     - public/javascripts/widgets/i18n.js
-    - public/javascripts/mobile.js
     - public/javascripts/application.js
     - public/javascripts/rails.js
   mailchimp:
diff --git a/public/javascripts/mobile.js b/public/javascripts/mobile.js
deleted file mode 100644
index 5438cde53..000000000
--- a/public/javascripts/mobile.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3 or later.  See
-*   the COPYRIGHT file.
-*/
-
-var Mobile = {
-  initialize: function() {
-    $('#main_stream + .pagination').hide();
-    $('a').live('tap',function(){
-      $(this).addClass('tapped');
-    })
-  },
-
-  windowLocation: function(url) {
-    window.location = url;
-  }
-};
-
-$(document).ready(function() {
-  Mobile.initialize();
- });
-