From bf20e5a9e81b683b66b780664829bed328728a06 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sun, 6 Feb 2011 23:09:04 -0800
Subject: [PATCH] remove some js assets from mobile

---
 app/helpers/application_helper.rb         |  7 ++++--
 app/views/layouts/application.mobile.haml |  4 ++--
 config/assets.yml                         |  5 ----
 public/javascripts/mobile.js              |  8 +------
 spec/javascripts/mobile-interface-spec.js | 29 -----------------------
 5 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 spec/javascripts/mobile-interface-spec.js

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0eb48c67c..00eb82f8c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -107,8 +107,11 @@ module ApplicationHelper
   end
 
   def how_long_ago(obj)
-    timeago(obj.created_at)
-    #I18n.t('ago', :time => time_ago_in_words(obj.created_at, true))
+    if is_mobile_device?
+      time_ago_in_words(obj.created_at)
+    else
+      timeago(obj.created_at)
+    end
   end
 
   def person_url(person)
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index 030672138..23f862392 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -14,7 +14,7 @@
     -if current_user
       :javascript
         Diaspora.widgets.i18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
-        
+
     = stylesheet_link_tag 'vendor/jquery.mobile-1.0a3.min', 'mobile'
     = csrf_meta_tag
 
@@ -80,7 +80,7 @@
               = link_to t('people.edit.your_profile'), person_path(current_user.person)
             %li
               = link_to t('notifications.index.notifications'), notifications_path
-              .ui-li-count 
+              .ui-li-count
                 = @notification_count
 
           %h4
diff --git a/config/assets.yml b/config/assets.yml
index 1f154e490..f615fadbe 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -28,15 +28,10 @@ javascripts:
     - public/javascripts/search.js
   mobile:
     - public/javascripts/vendor/jquery144.min.js
-    - public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
     - public/javascripts/custom-mobile-scripting.js
     - public/javascripts/vendor/jquery.mobile-1.0a3.min.js
     - public/javascripts/vendor/jquery.infinitescroll.min.js
-    - public/javascripts/vendor/timeago.js
     - public/javascripts/diaspora.js
-    - public/javascripts/widgets/alert.js
-    - public/javascripts/widgets/i18n.js
-    - public/javascripts/widgets/timeago.js
     - public/javascripts/mobile.js
     - public/javascripts/application.js
     - public/javascripts/rails.js
diff --git a/public/javascripts/mobile.js b/public/javascripts/mobile.js
index abba63bc6..5438cde53 100644
--- a/public/javascripts/mobile.js
+++ b/public/javascripts/mobile.js
@@ -5,18 +5,12 @@
 
 var Mobile = {
   initialize: function() {
-    $("abbr.timeago").timeago();
     $('#main_stream + .pagination').hide();
-    $('#aspect_picker').change(Mobile.changeAspect);
     $('a').live('tap',function(){
       $(this).addClass('tapped');
     })
   },
-  
-  changeAspect: function() {
-    Mobile.windowLocation('/aspects/' + $('#aspect_picker option:selected').val());
-  },
-  
+
   windowLocation: function(url) {
     window.location = url;
   }
diff --git a/spec/javascripts/mobile-interface-spec.js b/spec/javascripts/mobile-interface-spec.js
deleted file mode 100644
index 4b8e6ed37..000000000
--- a/spec/javascripts/mobile-interface-spec.js
+++ /dev/null
@@ -1,29 +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.
-*/
-
-describe("mobile interface", function() {
-  describe("initialize", function() {
-    it("attaches a change event to the select box", function() {
-      spyOn($.fn, 'change');
-      Mobile.initialize();
-      expect($.fn.change).toHaveBeenCalledWith(Mobile.changeAspect);
-      expect($.fn.change.mostRecentCall.object.selector).toEqual("#aspect_picker");
-    });
-  });
-  
-  
-  describe("change", function() {
-    it("changes to the aspect show page", function() {
-      $('#jasmine_content').html(
-'<select id="aspect_picker" name="aspect_picker" tabindex="-1">' +
-'   <option value="family-aspect-id">Family</option>' +
-'   <option value="work-aspect-id">Work</option>' +
-'</select>');
-      spyOn(Mobile, "windowLocation");
-      $.proxy(Mobile.changeAspect, $('#aspect_picker > option').first())()
-      expect(Mobile.windowLocation).toHaveBeenCalledWith("/aspects/family-aspect-id");
-    });
-  });
-});
\ No newline at end of file