From 72ff54213abe2d6302025200150dccd7e22c5cea Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 28 Apr 2015 20:07:21 -0500 Subject: [PATCH] * VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch --- web/app/assets/javascripts/accounts.js | 2 -- web/app/assets/javascripts/wizard/gear_utils.js | 4 +++- web/app/views/clients/_account.html.erb | 2 +- web/config/application.rb | 2 ++ web/config/initializers/gon.rb | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/app/assets/javascripts/accounts.js b/web/app/assets/javascripts/accounts.js index 91454c046..b392633e2 100644 --- a/web/app/assets/javascripts/accounts.js +++ b/web/app/assets/javascripts/accounts.js @@ -130,8 +130,6 @@ $('#account-content-scroller').on('click', '#account-edit-video-link', function(evt) { evt.stopPropagation(); navToEditVideo(); return false; } ); $('#account-content-scroller').on('avatar_changed', '#profile-avatar', function(evt, newAvatarUrl) { evt.stopPropagation(); updateAvatar(newAvatarUrl); return false; }) - // License dialog: - $("#account-content-scroller").on('click', '#account-view-license-link', function(evt) {evt.stopPropagation(); app.layout.showDialog('jamtrack-license-dialog'); return false; } ); $("#account-content-scroller").on('click', '#account-payment-history-link', function(evt) {evt.stopPropagation(); navToPaymentHistory(); return false; } ); } diff --git a/web/app/assets/javascripts/wizard/gear_utils.js b/web/app/assets/javascripts/wizard/gear_utils.js index a68a07894..f69f2411f 100644 --- a/web/app/assets/javascripts/wizard/gear_utils.js +++ b/web/app/assets/javascripts/wizard/gear_utils.js @@ -48,7 +48,9 @@ var badNetworkScore = networkScore < 2; // for now, ignore latency - highLatency = false + if(gon.global.gear_check_ignore_high_latency) { + highLatency = false + } return { canPlay: !isNoInputProfile && !highLatency, diff --git a/web/app/views/clients/_account.html.erb b/web/app/views/clients/_account.html.erb index aff5520fc..12089c9f2 100644 --- a/web/app/views/clients/_account.html.erb +++ b/web/app/views/clients/_account.html.erb @@ -120,7 +120,7 @@ {{data.licenseDetail}}
- JamTracks License + JamTracks License
diff --git a/web/config/application.rb b/web/config/application.rb index 63dd5400c..ad3aff3e3 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -330,5 +330,7 @@ if defined?(Bundler) config.minimal_curtain = false config.video_available = "none" config.alerts_api_enabled = true + + config.gear_check_ignore_high_latency = false end end diff --git a/web/config/initializers/gon.rb b/web/config/initializers/gon.rb index 9e222bf5b..ff5a4d74f 100644 --- a/web/config/initializers/gon.rb +++ b/web/config/initializers/gon.rb @@ -13,4 +13,5 @@ Gon.global.influxdb_password = Rails.application.config.influxdb_unsafe_password Gon.global.recurly_public_api_key = Rails.application.config.recurly_public_api_key Gon.global.one_free_jamtrack_per_user = Rails.application.config.one_free_jamtrack_per_user Gon.global.video_available = Rails.application.config.video_available +Gon.global.gear_check_ignore_high_latency = Rails.application.config.gear_check_ignore_high_latency Gon.global.env = Rails.env