Fix issue with autoload

codexa · Dec 11, 2015 · 9819961 · 9819961
1 parent 64904d7
commit 9819961
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/scripts/firetext.js b/scripts/firetext.js
@@ -65,10 +65,15 @@ firetext.init = function () {
 					// Wait until Dropbox is authenticated
 					if (lastDoc[3] == 'dropbox') {
 						if (firetext.settings.get('dropbox.enabled') == 'true') {
-							window.addEventListener('cloud.dropbox.authed', function() {
+							if (cloud.dropbox.client) {
 								loadToEditor(lastDoc[0], lastDoc[1], lastDoc[2], lastDoc[3]);
-								spinner('hide');
-							});
+								spinner('hide');								
+							} else {
+								window.addEventListener('cloud.dropbox.authed', function() {
+									loadToEditor(lastDoc[0], lastDoc[1], lastDoc[2], lastDoc[3]);
+									spinner('hide');
+								});								
+							}
 						} else {
 							spinner('hide');
 						}
@@ -77,12 +82,12 @@ firetext.init = function () {
 						spinner('hide');
 					}
 				} else {
-					regions.nav('welcome');
 					spinner('hide');
 				}
-			} else {
 				regions.nav('welcome');
+			} else {
 				spinner('hide');
+				regions.nav('welcome');
 			}
 
 			// Create listeners