JS cleanup

config/assets.yml

@@ -31,7 +31,6 @@ javascripts:
     - public/javascripts/widgets/timeago.js
     - public/javascripts/view.js
     - public/javascripts/stream.js
-    - public/javascripts/application.js
     - public/javascripts/search.js
     - public/javascripts/infinite-scroll.js
   mobile:
@@ -42,7 +41,6 @@ javascripts:
     - public/javascripts/diaspora.js
     - public/javascripts/widgets/i18n.js
     - public/javascripts/infinite-scroll.js
-    - public/javascripts/application.js
     - public/javascripts/rails.js
   mailchimp:
     - public/javascripts/vendor/mailchimp/jquery.form.js

public/javascripts/application.js

@@ -1,12 +0,0 @@
-$(document).ready(function() {
-
-  InfiniteScroll.initialize();
-
-  $("a.paginate").live("click", function() {
-    $(this).css("display", "none");
-
-    $(document).trigger("retrieve.infscr");
-  })
-  .css("display", "none");
-});
-

public/javascripts/aspect-contacts.js

@@ -1,42 +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.
-*/
-
-$("#edit_aspect_trigger").live("click", function() {
-    EditPane.toggle();
-});
-
-var EditPane = {
-  setTranslations: function(translations) {
-    EditPane.translations = translations;
-  },
-
-  toggle: function() {
-    if( $("#edit_aspect_pane").hasClass("active") ) {
-      EditPane.fadeOut();
-    } else {
-      EditPane.fadeIn();
-    }
-  },
-
-  fadeIn: function() {
-    var trigger = $("#edit_aspect_trigger");
-
-    $("#edit_aspect_pane").addClass("active");
-    $(".contact_pictures").fadeOut(200, function() {
-      $("#edit_aspect_pane").fadeIn(200);
-      trigger.html(EditPane.translations.doneEditing);
-    });
-  },
-
-  fadeOut: function() {
-    var trigger = $("#edit_aspect_trigger");
-    trigger.html(EditPane.translations.editAspect);
-
-    $("#edit_aspect_pane").removeClass("active");
-    $("#edit_aspect_pane").fadeOut(200, function() {
-      $(".contact_pictures").fadeIn(200);
-    });
-  }
-};

public/javascripts/infinite-scroll.js

@@ -29,3 +29,8 @@ var InfiniteScroll = {
     InfiniteScroll.postScrollCallbacks.push(callback);
   }
 }
+
+$(document).ready(function() {
+  InfiniteScroll.initialize();
+});
+

spec/javascripts/aspect-contacts-spec.js

@@ -1,14 +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("EditPane", function() {
-    describe("setTranslations", function() {
-      it("sets the translations object", function(){
-        var input = {doneEditing: 'I am done editing'};
-        EditPane.setTranslations(input);
-        expect(EditPane.translations.doneEditing).toEqual('I am done editing');
-      });
-  });
-});

spec/javascripts/support/jasmine.yml

@@ -29,7 +29,6 @@ src_files:
   - public/javascripts/widgets/timeago.js
   - public/javascripts/mobile.js
   - public/javascripts/infinite-scroll.js
-  - public/javascripts/aspect-contacts.js
   - public/javascripts/contact-list.js
   - public/javascripts/web-socket-receiver.js
   - public/javascripts/view.js