diff --git a/config/assets.yml b/config/assets.yml index 31c3c4967..ebb21890d 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -82,7 +82,6 @@ javascripts: - public/javascripts/publisher.js - public/javascripts/aspect-filters.js - public/javascripts/aspect-edit-pane.js - - public/javascripts/tag-followings.js - public/javascripts/fileuploader-custom.js people: - public/javascripts/vendor/jquery.autoSuggest.custom.js diff --git a/public/javascripts/tag-followings.js b/public/javascripts/tag-followings.js deleted file mode 100644 index e72f5840b..000000000 --- a/public/javascripts/tag-followings.js +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2011, Diaspora Inc. This file is -* licensed under the Affero General Public License version 3 or later. See -* the COPYRIGHT file. -*/ - -var TagFollowings = { - initialize: function(){ - $('.unfollow').live('mouseenter', function(){ - $(this).find('.unfollow_icon').removeClass('hidden'); - }).live('mouseleave', function(){ - $(this).find('.unfollow_icon').addClass('hidden'); - }); - } -}; - -$(document).ready(function() { - TagFollowings.initialize(); -}); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a8ff8676e..e0f276da8 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2884,6 +2884,7 @@ ul.left_nav @include transition(opacity) @include opacity(0.3) :float right + :display none &:hover @include opacity(1) @@ -2893,7 +2894,6 @@ ul.left_nav .edit :margin-top 4px - :display none .contact_count @include border-radius(4px) @@ -2939,7 +2939,8 @@ ul.left_nav :width 140px li:hover - .edit + .edit, + .unfollow_icon :display inline-block .stream_container diff --git a/spec/javascripts/tag-followings-spec.js b/spec/javascripts/tag-followings-spec.js deleted file mode 100644 index f26b2c37a..000000000 --- a/spec/javascripts/tag-followings-spec.js +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (c) 2011, Diaspora Inc. This file is -* licensed under the Affero General Public License version 3 or later. See -* the COPYRIGHT file. -*/ - -describe("TagFollowings", function() { - describe("unfollow", function(){ - it("tests unfollow icon visibility on mouseover event", function(){ - spec.loadFixture('aspects_index_with_one_followed_tag'); - TagFollowings.initialize(); - - var tag_li = $('li.unfollow#partytimeexcellent'); - var icon_div = $('.unfollow_icon'); - - expect(icon_div.hasClass('hidden')).toBeTruthy(); - tag_li.mouseover(); - expect(icon_div.hasClass('hidden')).toBeFalsy(); - tag_li.mouseout(); - expect(icon_div.hasClass('hidden')).toBeTruthy(); - }); - }); -});