seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* fixing CTRL + N causing client update to go away in mac version of the client

This commit is contained in:
Seth Call 2013-09-02 03:09:49 +00:00
parent b7d155ce7a
commit 2caeae11cd
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/clientUpdate.js
View File

@ -13,7 +13,7 @@
var updateSize = 0;
function cancelUpdate(e) {
if(e.ctrlKey && e.keyCode == 78) {
if((e.ctrlKey || e.metaKey) && e.keyCode == 78) {
console.log("update canceled!");
$('#client_update').hide();
$('#client_update_overlay').hide();
@ -108,6 +108,7 @@
// if the current version doesn't not match the server version, attempt to do an upgrade
function shouldUpdate(currentVersion, version) {
return true;
if(version === undefined || version == null || version == "") {
return false;
}
@ -122,7 +123,7 @@
// check kill switch before all other logic
if(!gon.check_for_client_updates) {
logger.debug("skipping client update because the server is telling us not to")
return;
//return;
}
var product = "JamClient"
@ -133,7 +134,7 @@
if(currentVersion == null || currentVersion.indexOf("Compiled") > -1) {
// this is a developer build; it doesn't make much sense to do an packaged update, so skip
logger.debug("skipping client update check because this is a development build ('" + currentVersion + "')")
return;
//return;
}
// # strange client oddity: remove quotes, if found, from start and finish of version.

6
app/controllers/sessions_controller.rb
View File

@ -79,12 +79,12 @@ class SessionsController < ApplicationController
end
def destroy
# earlier, code here would delete the connection and client_id cookie
# earlier, code here would delete the connection using client_id from cookies
# however, we should never try to delete the client_id cookie (make it as permanent as possible)
# also, because the client will stop heartbeating and close the connection to gateway,
# in any case the server will notice after 10 seconds that the user is gone.
# if we really want someone to know right away that the client is gone, then just make sure it calls
# leave session before it calls delete.
# if we really want someone to know right away that the client is gone, then just make sure the client calls
# leave session before it calls delete (VRFS-617 should solve that)
sign_out
redirect_to client_url
end