From 6c0daf3c3eaf28a083a0db80c72e8840a3d4aa9e Mon Sep 17 00:00:00 2001 From: Chrisbr Date: Wed, 23 Jul 2014 16:06:19 +0200 Subject: [PATCH 1/2] Enables Javascript error validation for poltergeist --- spec/spec_helper.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 69e942b4..dd9400f6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -62,10 +62,6 @@ RSpec.configure do |config| end # 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 # Includes helpers and connect them to specific types of tests From 5e9cc49ef497d8d5aaa534d223ff4d501b0c025c Mon Sep 17 00:00:00 2001 From: Chrisbr Date: Wed, 23 Jul 2014 16:06:37 +0200 Subject: [PATCH 2/2] Fix Javascript error on dashboard close #354 --- app/assets/javascripts/dashboard.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index f260ef38..f1de68a3 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -78,7 +78,11 @@ $(function() { var options = {}; options.fillColor = "rgba(255,255,255,0.0)"; 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) } }