Merge pull request #37 from finnlabs/feature/rails3_fix_burndown_assets

Feature/rails3 fix burndown assets
pull/6827/head
ulferts 12 years ago
commit 74e799a914
  1. 1
      app/assets/javascripts/backlogs/backlogs.js
  2. 15
      app/helpers/rb_common_helper.rb
  3. 2
      app/views/rb_burndown_charts/_burndown.html.erb

@ -1,5 +1,6 @@
//= require jquery.ui.all
//= require backlogs/jquery.flot/jquery.flot
//= require backlogs/jquery.flot/excanvas
//= require backlogs/jquery.jeditable.mini
//= require backlogs/jquery.cookie
//= require backlogs/livepipe-ui/livepipe

@ -116,21 +116,6 @@ module RbCommonHelper
item.remaining_hours.blank? || item.remaining_hours==0 ? "" : item.remaining_hours
end
def javascript_include_tag_backlogs(*args)
min = ENV["RAILS_ENV"] == 'development' ? "" : ".min"
args.each do |jsfile|
jsfile.gsub!('jquery.js', "jquery-1.5.1#{min}.js")
jsfile.gsub!('jquery-ui.js', "jquery-ui-1.8.11.custom.min.js")
jsfile.gsub!('jquery.jeditable.js', "jquery.jeditable.mini.js")
jsfile.gsub!('excanvas.js', "excanvas#{min}.js")
jsfile.gsub!('jquery.jqplot.js', "jquery.jqplot#{min}.js")
end
args.push(:plugin => 'chiliproject_backlogs')
javascript_include_tag *args
end
def available_story_trackers
@available_story_trackers ||= begin
trackers = story_trackers & @project.trackers if @project

@ -1,4 +1,4 @@
<!--[if IE]><%= javascript_include_tag 'backlogs/lib/jquery.flot/excanvas.js', :plugin => 'chiliproject_backlogs' %><![endif]-->
<!--[if IE]><%= javascript_include_tag 'backlogs/jquery.flot/excanvas.js' %><![endif]-->
<script type="text/javascript" language="javascript">
jQuery(function ($) {

Loading…
Cancel
Save