* VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch

This commit is contained in:
Seth Call 2015-04-28 20:07:21 -05:00
parent a6128a195b
commit 72ff54213a
5 changed files with 7 additions and 4 deletions

View File

@ -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; } );
}

View File

@ -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,

View File

@ -120,7 +120,7 @@
{{data.licenseDetail}}
</strong>
<br clear="all" />
<a href="#" class="view-license" id="account-view-license-link">JamTracks License</a>
<a href="/corp/terms#purchasing-jamtracks" rel="external" class="view-license" id="account-view-license-link">JamTracks License</a>
</div>
<div class="right">

View File

@ -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

View File

@ -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