mirror of
https://github.com/redmine/redmine.git
synced 2025-11-10 15:26:03 +01:00
Update Rails ujs (#31205).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@18062 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -1518,7 +1518,7 @@ module ApplicationHelper
|
|||||||
|
|
||||||
# Returns the javascript tags that are included in the html layout head
|
# Returns the javascript tags that are included in the html layout head
|
||||||
def javascript_heads
|
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'
|
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)}'); });")
|
tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ module MyHelper
|
|||||||
handle = content_tag('span', '', :class => 'sort-handle', :title => l(:button_move))
|
handle = content_tag('span', '', :class => 'sort-handle', :title => l(:button_move))
|
||||||
close = link_to(l(:button_delete),
|
close = link_to(l(:button_delete),
|
||||||
{:action => "remove_block", :block => block},
|
{:action => "remove_block", :block => block},
|
||||||
:remote => true, :method => 'post',
|
:remote => true, :method => 'post',
|
||||||
:class => "icon-only icon-close", :title => l(:button_delete))
|
:class => "icon-only icon-close", :title => l(:button_delete))
|
||||||
content = content_tag('div', handle + close, :class => 'contextual') + content
|
content = content_tag('div', handle + close, :class => 'contextual') + content
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<div class="contextual">
|
<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)) %>:
|
<%= label_tag('block-select', l(:button_add)) %>:
|
||||||
<%= block_select_tag(@user) %>
|
<%= block_select_tag(@user) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user