nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3380 from stevenh512/fix_confirm_deprecation

Browse source 
Fix deprecation warning, :confirm option on links is deprecated
This commit is contained in:
Steven Hancock 2012-06-14 02:18:38 -07:00
commit 7e41974666
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/aspects/edit.html.haml
View file

@ -20,7 +20,7 @@
%br
.bottom_submit_section
.left
= button_to t('delete'), @aspect, :method => "delete", :confirm => t('.confirm_remove_aspect'), :class => 'button delete'
= button_to t('delete'), @aspect, :method => "delete", :data => { :confirm => t('.confirm_remove_aspect') }, :class => 'button delete'
- if @aspect.contacts_visible
= link_to image_tag('icons/padlock-open.png', :height => 16, :width => 16, :id => "contact_visibility_padlock", :class => 'open', :title => t('.aspect_list_is_visible')),
aspect_toggle_contact_visibility_path(@aspect), :method => :put, :remote => true

2
app/views/conversations/_show.haml
View file

@ -4,7 +4,7 @@
.conversation_participants
.right
= link_to(image_tag('deletelabel.png'), conversation_visibility_path(conversation), :method => 'delete', :confirm => "#{t('.delete')}?", :title => t('.delete'))
= link_to(image_tag('deletelabel.png'), conversation_visibility_path(conversation), :method => 'delete', :data => { :confirm => "#{t('.delete')}?" }, :title => t('.delete'))
%h3{ :class => direction_for(conversation.subject) }
= conversation.subject

2
app/views/registrations/edit.html.haml
View file

@ -24,5 +24,5 @@
= f.submit t('.update')
%h3 t('.cancel_my_account')
%p
= t('.unhappy') #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('are_you_sure'), :method => :delete}.
= t('.unhappy') #{link_to t('.cancel_my_account'), registration_path(resource_name), :data => { :confirm => t('are_you_sure') }, :method => :delete}.
= link_to t('back'), :back

2
app/views/shared/_add_remove_services.haml
View file

@ -10,7 +10,7 @@
%b= service.provider
= t('services.index.logged_in_as')
%b= service.nickname
= link_to t('services.index.disconnect'), service_path(service), :confirm => t('services.index.really_disconnect', :service => service.provider), :method => :delete
= link_to t('services.index.disconnect'), service_path(service), :data => { :confirm => t('services.index.really_disconnect', :service => service.provider) }, :method => :delete
- else
= t('services.index.no_services')

2
app/views/tags/_followed_tags_listings.haml
View file

@ -13,7 +13,7 @@
- for tg in tags
%li.unfollow{:id => "tag-following-#{tg.name}"}
.unfollow_icon.hidden
= link_to image_tag("icons/monotone_close_exit_delete.png", :height => 16, :title => t('aspects.index.unfollow_tag', :tag => tg.name)), tag_tag_followings_path(:name => tg.name, :remote => true), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :id => "unfollow_" + tg.name
= link_to image_tag("icons/monotone_close_exit_delete.png", :height => 16, :title => t('aspects.index.unfollow_tag', :tag => tg.name)), tag_tag_followings_path(:name => tg.name, :remote => true), :data => { :confirm => t('are_you_sure') }, :method => :delete, :remote => true, :id => "unfollow_" + tg.name
= link_to "##{tg.name}", tag_path(:name => tg.name), :class => "tag_selector"
%li
= form_for TagFollowing.new do |tg|

2
app/views/users/edit.html.haml
View file

@ -224,4 +224,4 @@
= f.label :close_account_password, t('.current_password'), :for => :close_account_password
= f.password_field :current_password, :id => :close_account_password
%p
= f.submit t('.close_account_text'), :confirm => t('are_you_sure_delete_account')
= f.submit t('.close_account_text'), :data => { :confirm => t('are_you_sure_delete_account') }