remove references to fancybox, we use facebox

This commit is contained in:
Dan Hansen 2011-01-13 00:24:10 -06:00
parent e456c9d880
commit ce4fe1938c
6 changed files with 6 additions and 32 deletions

View file

@ -51,7 +51,7 @@
%span.tip click to edit %span.tip click to edit
%ul.tools %ul.tools
%li= link_to t('.add_a_new_contact'), "#manage_aspect_contacts_pane_#{hash[:aspect].id}", :class => 'manage_aspect_contacts_button' %li= link_to t('.add_a_new_contact'), "#manage_aspect_contacts_pane_#{hash[:aspect].id}", :class => 'manage_aspect_contacts_button', :rel => "facebox"
%li!= remove_link(hash[:aspect]) %li!= remove_link(hash[:aspect])
%ul.dropzone{:data=>{:aspect_id=>hash[:aspect].id}} %ul.dropzone{:data=>{:aspect_id=>hash[:aspect].id}}
@ -65,7 +65,7 @@
.draggable_info .draggable_info
=t('.drag_to_add') =t('.drag_to_add')
.fancybox_content .facebox_content
%div{:id => "manage_aspect_contacts_pane_#{hash[:aspect].id}"} %div{:id => "manage_aspect_contacts_pane_#{hash[:aspect].id}"}
= render "requests/manage_aspect_contacts", :aspect => hash[:aspect], :manage => true, :contact_hashes => hash[:contacts] = render "requests/manage_aspect_contacts", :aspect => hash[:aspect], :manage => true, :contact_hashes => hash[:contacts]

View file

@ -51,7 +51,7 @@
%li %li
= link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect'), :rel => 'facebox' = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect'), :rel => 'facebox'
.fancybox_content .facebox_content
#add_aspect_pane #add_aspect_pane
= render "aspects/new_aspect" = render "aspects/new_aspect"

View file

@ -46,9 +46,9 @@
- for service in current_user.services - for service in current_user.services
= image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider
= link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;" = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;", :rel => 'facebox'
.fancybox_content .facebox_content
#question_mark_pane #question_mark_pane
= render 'shared/public_explain' = render 'shared/public_explain'

View file

@ -65,20 +65,6 @@ var View = {
selector: ".add_aspect_button" selector: ".add_aspect_button"
}, },
fancyBoxButtons: {
selectors: [
".add_aspect_button",
".manage_aspect_contacts_button",
".invite_user_button",
".add_photo_button",
".remove_person_button",
".question_mark",
".share_with_button",
".aspect_detail_button",
".aspect_selector_edit"
]
},
debug: { debug: {
click: function() { click: function() {
$("#debug_more").toggle("fast"); $("#debug_more").toggle("fast");

View file

@ -1207,10 +1207,6 @@ ul#settings_nav
.settings_pane .settings_pane
:display none :display none
#fancybox-close:hover
:background
:color transparent
.contact_pictures, .contact_pictures,
#aspect_listings li #aspect_listings li
img img
@ -1302,7 +1298,7 @@ input[type="search"]
:-webkit-appearance textfield :-webkit-appearance textfield
:-moz-appearance textfield :-moz-appearance textfield
.fancybox_content .facebox_content
:display none :display none
#photo_edit_options #photo_edit_options

View file

@ -11,14 +11,6 @@ describe("View", function() {
}); });
}); });
describe("fancyBoxButtons", function() {
describe("selectors", function() {
it("is an array of all the selectors that will have fancybox attached", function() {
expect(typeof View.fancyBoxButtons.selectors === "object").toBeTruthy();
expect($.isArray(View.fancyBoxButtons.selectors)).toBeTruthy();
});
});
});
describe("debug", function() { describe("debug", function() {
describe("click", function() { describe("click", function() {