From 45052b42f89d870fc86ce4646b58404be9e23f08 Mon Sep 17 00:00:00 2001 From: Lewis Hemens Date: Tue, 25 Mar 2014 22:19:41 +0000 Subject: [PATCH] Add delay to load-from-hash which doesn't always seem to work --- js-compiled.js | 8 +++++--- js-lib/drive-controller.js | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js-compiled.js b/js-compiled.js index 912fb01..dd5b9b5 100644 --- a/js-compiled.js +++ b/js-compiled.js @@ -60,7 +60,7 @@ function ea(a, b) { this.zoom = 1; this.offset = new l(7500, 7500); this.d = !0; - this.s = f; + this.s = !1; A(this); } function A(a) { @@ -490,7 +490,7 @@ T.prototype.n = function() { $(".dialog").removeClass("visible"); "box-button" == a && (this.c = new I(this.state)); "line-button" == a && (this.c = new L(this.state)); - "freeform-button" == a && (this.c = new M(this.state, "+")); + "freeform-button" == a && (this.c = new M(this.state, "X")); "erase-button" == a && (this.c = new O(this.state)); "move-button" == a && (this.c = new P(this.state)); "text-button" == a && (this.c = new N(this.state)); @@ -583,7 +583,9 @@ function la(a, b) { } function V(a, b) { window.gapi.auth.authorize({client_id:"125643747010-9s9n1ne2fnnuh5v967licfkt83r4vba5.apps.googleusercontent.com", scope:"https://www.googleapis.com/auth/drive", immediate:b}, function(a) { - !a || a.error || this.p || (this.p = !0, $("#drive-button").addClass("active"), ra(this)); + !a || a.error || this.p || (this.p = !0, $("#drive-button").addClass("active"), window.setTimeout(function() { + ra(this); + }.bind(this), 500)); }.bind(a)); } function ma(a) { diff --git a/js-lib/drive-controller.js b/js-lib/drive-controller.js index 6815c92..daf6b7a 100644 --- a/js-lib/drive-controller.js +++ b/js-lib/drive-controller.js @@ -70,7 +70,8 @@ ascii.DriveController.prototype.checkAuth = function(immediate) { this.driveEnabled = true; $('#drive-button').addClass('active'); // We are authorized, so let's se if we can load from the URL hash. - this.loadFromHash(); + // This seems to fail if we do it too early. + window.setTimeout(function() { this.loadFromHash(); }.bind(this), 500); } }.bind(this)); };