diff --git a/web/app/assets/javascripts/clientUpdate.js b/web/app/assets/javascripts/clientUpdate.js index ee2c99ce9..627a0e48d 100644 --- a/web/app/assets/javascripts/clientUpdate.js +++ b/web/app/assets/javascripts/clientUpdate.js @@ -61,7 +61,7 @@ return false; }) } - else if (templateId == "update-restarting" || templateId == "update-error") { + else if (templateId == "update-restarting" || templateId == "update-error" || templateId == "manual-upgrade") { $("#client_update a.open-downloads").click(function () { context.JK.popExternalLink("https://www.jamkazam.com/downloads") @@ -243,7 +243,13 @@ // this will update the client dialog to how it should look when an update is just starting // and show it front-and-center on the screen - updateClientUpdateDialog("update-start", { uri: updateUri }) + // XXX HACK + if(updateUri && gon.global.manual_override_installer_ends_with && updateUri.endsWith(gon.global.manual_override_installer_ends_with)) { + updateClientUpdateDialog("manual-upgrade", { uri: updateUri }) + } + else { + updateClientUpdateDialog("update-start", { uri: updateUri }) + } } } @@ -251,6 +257,7 @@ function check() { var os = context.JK.GetOSAsString(); + //os = 'Win32' // check kill switch before all other logic if (!gon.check_for_client_updates) { @@ -333,4 +340,4 @@ return this; -})(window, jQuery); \ No newline at end of file +})(window, jQuery); diff --git a/web/app/views/clients/_client_update.html.erb b/web/app/views/clients/_client_update.html.erb index a2d64ae05..ec80b0110 100644 --- a/web/app/views/clients/_client_update.html.erb +++ b/web/app/views/clients/_client_update.html.erb @@ -105,4 +105,30 @@ CANCEL AND CLOSE APPLICATION --> - \ No newline at end of file + + + + diff --git a/web/config/application.rb b/web/config/application.rb index 66d305676..6ecd32178 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -507,5 +507,6 @@ if defined?(Bundler) config.video_conferencing_host = "https://webrtc-demo.jamkazam.com" config.latency_data_host = "http://localhost:4001" config.latency_data_host_auth_code = "c2VydmVyOnBhc3N3b3Jk" + config.manual_override_installer_ends_with = "JamKazam-1.0.3776.dmg" end end diff --git a/web/config/initializers/gon.rb b/web/config/initializers/gon.rb index afe4a7f2a..cbf6ec62e 100644 --- a/web/config/initializers/gon.rb +++ b/web/config/initializers/gon.rb @@ -30,5 +30,6 @@ Gon.global.subscription_codes = Rails.application.config.subscription_codes Gon.global.braintree_token = Rails.application.config.braintree_token Gon.global.paypal_admin_only = Rails.application.config.paypal_admin_only Gon.global.use_video_conferencing_server = Rails.application.config.use_video_conferencing_server +Gon.global.manual_override_installer_ends_with = Rails.application.config.manual_override_installer_ends_with Gon.global.env = Rails.env Gon.global.version = ::JamWeb::VERSION