From d2cd527f103cef38728cab0e7a03597b6f13f4f6 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 15 Sep 2014 07:45:17 -0500 Subject: [PATCH] * fix preferences window not showing --- web/app/assets/javascripts/everywhere/everywhere.js | 4 ++-- web/app/assets/javascripts/sessionModel.js | 2 +- web/config/application.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/app/assets/javascripts/everywhere/everywhere.js b/web/app/assets/javascripts/everywhere/everywhere.js index ca1e659e0..b3272d0c6 100644 --- a/web/app/assets/javascripts/everywhere/everywhere.js +++ b/web/app/assets/javascripts/everywhere/everywhere.js @@ -41,14 +41,14 @@ checkMacOSXInstalledCorrectly(); - watchPreferencesEvent(); + watchPreferencesEvent(app); initializeStun(app); operationalEvents(app); }); - function watchPreferencesEvent() { + function watchPreferencesEvent(app) { context.JK.onBackendEvent(ALERT_NAMES.SHOW_PREFERENCES, 'everywhere', function() { app.layout.showDialog('client-preferences-dialog') }); diff --git a/web/app/assets/javascripts/sessionModel.js b/web/app/assets/javascripts/sessionModel.js index c147007b2..054f1953e 100644 --- a/web/app/assets/javascripts/sessionModel.js +++ b/web/app/assets/javascripts/sessionModel.js @@ -551,7 +551,7 @@ backendMixerAlertThrottleTimer = setTimeout(function() { // this is a local change to our tracks. we need to tell the server about our updated track information var inputTracks = context.JK.TrackHelpers.getUserTracks(context.jamClient); - + // create a trackSync request based on backend data var syncTrackRequest = {}; syncTrackRequest.client_id = app.clientId; diff --git a/web/config/application.rb b/web/config/application.rb index 4d1baf441..2de9677d2 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -264,8 +264,8 @@ if defined?(Bundler) # getWork tweak parameters config.getwork_result_size = 100 # how many results can we return back in getWork API? config.staleness_hours = 24 * 5 # how old in hours does a score have to be before we ask for a new one? - config.scoring_timeout_minutes = 30 - config.scoring_timeout_threshold = 5 + config.scoring_timeout_minutes = 30 # how long to put a client in the doghouse if it keeps making bad scores + config.scoring_timeout_threshold = 5 # how many consequetive bad scores before you are put into the doghouse config.scoring_get_work_interval = 1000 # how much time between normal getwork requests config.scoring_get_work_backoff_interval = 60 * 1000 # how much time between failed getwork requests end