Bladeren bron

Update Rails ujs (#31205).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18062 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Go MAEDA 5 jaren geleden
bovenliggende
commit
42532605db

+ 1
- 1
app/helpers/application_helper.rb Bestand weergeven

@@ -1518,7 +1518,7 @@ module ApplicationHelper

# Returns the javascript tags that are included in the html layout head
def javascript_heads
tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-4.3.1', 'application', 'responsive')
tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-5.2.3', 'application', 'responsive')
unless User.current.pref.warn_on_leaving_unsaved == '0'
tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
end

+ 1
- 1
app/helpers/my_helper.rb Bestand weergeven

@@ -37,7 +37,7 @@ module MyHelper
handle = content_tag('span', '', :class => 'sort-handle', :title => l(:button_move))
close = link_to(l(:button_delete),
{:action => "remove_block", :block => block},
:remote => true, :method => 'post',
:remote => true, :method => 'post',
:class => "icon-only icon-close", :title => l(:button_delete))
content = content_tag('div', handle + close, :class => 'contextual') + content


+ 1
- 1
app/views/my/page.html.erb Bestand weergeven

@@ -1,5 +1,5 @@
<div class="contextual">
<%= form_tag({:action => "add_block"}, :remote => true, :id => "block-form") do %>
<%= form_tag({:action => "add_block"}, :remote => true, :id => "block-form", authenticity_token: true) do %>
<%= label_tag('block-select', l(:button_add)) %>:
<%= block_select_tag(@user) %>
<% end %>

public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-5.2.3.js
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


Laden…
Annuleren
Opslaan