gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #367 from ChrisBr/fix_js_error

Browse source 
Enables poltergeist and fixes js error on dashboard
This commit is contained in:
Christian Bruckmayer 2014-07-23 16:16:56 +02:00
commit 3e5a089eb1
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/dashboard.js
View file

@ -78,7 +78,11 @@ $(function() {
var options = {}; var options = {};
options.fillColor = "rgba(255,255,255,0.0)"; options.fillColor = "rgba(255,255,255,0.0)";
options.strokeColor = conferences[i].color; options.strokeColor = conferences[i].color;
options.data = chart_data[conferences[i].short_title]; if(options.data == null || options.data.length == 0){
options.data = [0];
}else{
options.data = chart_data[conferences[i].short_title];
}
result.push(options) result.push(options)
} }
} }

4
spec/spec_helper.rb
View file

@ -62,10 +62,6 @@ RSpec.configure do |config|
end end
# poltergeist as a underlying mech for Capybara # poltergeist as a underlying mech for Capybara
Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, js_errors: false)
end
Capybara.javascript_driver = :poltergeist Capybara.javascript_driver = :poltergeist
# Includes helpers and connect them to specific types of tests # Includes helpers and connect them to specific types of tests