reorder js-includes

pull/1186/head
Philipp Tessenow 12 years ago
parent 3bceb7cf43
commit b840634952
  1. 5
      app/assets/javascripts/application.js
  2. 1
      app/helpers/application_helper.rb

@ -20,13 +20,14 @@
//= require effects //= require effects
//= require dragdrop //= require dragdrop
//= require controls //= require controls
//= require breadcrumb //= require i18n/translations
//= require select2 //= require select2
//= require openproject
//= require breadcrumb
//= require findDomElement //= require findDomElement
//= require context_menu //= require context_menu
//= require jstoolbar //= require jstoolbar
//= require calendar //= require calendar
//= require i18n/translations
//source: http://stackoverflow.com/questions/8120065/jquery-and-prototype-dont-work-together-with-array-prototype-reverse //source: http://stackoverflow.com/questions/8120065/jquery-and-prototype-dont-work-together-with-array-prototype-reverse
if (typeof []._reverse == 'undefined') { if (typeof []._reverse == 'undefined') {

@ -1081,7 +1081,6 @@ 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 user_specific_javascript_includes def user_specific_javascript_includes
tags = '' tags = ''
tags += javascript_include_tag("openproject.js")
tags += javascript_tag(%Q{ tags += javascript_tag(%Q{
window.openProject = new OpenProject({ window.openProject = new OpenProject({
urlRoot : '#{Redmine::Utils.relative_url_root}' urlRoot : '#{Redmine::Utils.relative_url_root}'

Loading…
Cancel
Save