From 8d8d3c649a12f10270efcf9331c72110181999a7 Mon Sep 17 00:00:00 2001
From: Fabian Rodriguez <fabianrbz@gmail.com>
Date: Sat, 4 Jan 2014 18:08:24 -0200
Subject: [PATCH] remove aspect sorting logic

---
 app/assets/javascripts/aspect-sorting.js | 18 ------------------
 app/assets/javascripts/main.js           |  1 -
 app/controllers/users_controller.rb      |  2 --
 app/models/user.rb                       |  8 --------
 4 files changed, 29 deletions(-)
 delete mode 100644 app/assets/javascripts/aspect-sorting.js

diff --git a/app/assets/javascripts/aspect-sorting.js b/app/assets/javascripts/aspect-sorting.js
deleted file mode 100644
index 74d08e17a..000000000
--- a/app/assets/javascripts/aspect-sorting.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*   Copyright (c) 2010-2011, Diaspora Inc.  This file is
- *   licensed under the Affero General Public License version 3 or later.  See
- *   the COPYRIGHT file.
- */
-
-$(document).ready(function() {
-  $('#aspect_nav.left_nav .all_aspects .sub_nav').sortable({
-    items: "li[data-aspect_id]",
-    update: function(event, ui) {
-      var order = $(this).sortable("toArray", {attribute: "data-aspect_id"}),
-          obj = { 'reorder_aspects': order, '_method': 'put' };
-      $.ajax('/user', { type: 'post', dataType: 'script', data: obj });
-    },
-    revert: true,
-    helper: 'clone'
-  });
-});
-
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 3397b3fcb..63f5fc755 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -35,7 +35,6 @@
 //= require aspects-dropdown
 //= require contact-edit
 //= require contact-list
-//= require aspect-sorting
 //= require mentions
 //= require bootstrap-tooltip
 //= require bootstrap-popover
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f7a2b3f94..97ed376eb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -71,8 +71,6 @@ class UsersController < ApplicationController
           flash[:error] = I18n.t 'users.update.follow_settings_not_changed'
         end
       end
-    elsif aspect_order = params[:reorder_aspects]
-      @user.reorder_aspects(aspect_order)
     end
 
     respond_to do |format|
diff --git a/app/models/user.rb b/app/models/user.rb
index 8105d0961..0df8d75df 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -422,14 +422,6 @@ class User < ActiveRecord::Base
     end
   end
 
-  def reorder_aspects(aspect_order)
-    i = 0
-    aspect_order.each do |id|
-      self.aspects.find(id).update_attributes({ :order_id => i })
-      i += 1
-    end
-  end
-
   # Generate public/private keys for User and associated Person
   def generate_keys
     key_size = (Rails.env == 'test' ? 512 : 4096)