Sfoglia il codice sorgente

Merged r14654 (#20380).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14656 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.0.6
Jean-Philippe Lang 8 anni fa
parent
commit
8a338756fd

+ 1
- 1
Gemfile Vedi File

end end


gem "rails", "4.2.3" gem "rails", "4.2.3"
gem "jquery-rails", "~> 3.1.3"
gem "jquery-rails", "~> 3.1.4"
gem "coderay", "~> 1.1.0" gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4" gem "builder", ">= 3.0.4"
gem "request_store", "1.0.5" gem "request_store", "1.0.5"

+ 1
- 1
app/helpers/application_helper.rb Vedi File



# 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-3.1.3', 'application')
tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.4', 'application')
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

public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.4.js
File diff soppresso perché troppo grande
Vedi File


Loading…
Annulla
Salva