From 85078fd328d50edeeec188eefd41481d6eb824cb Mon Sep 17 00:00:00 2001
From: Cheng-Han, Wu
Date: Wed, 16 Mar 2016 12:46:29 +0800
Subject: Fixed minor bugs

---
 public/js/index.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'public/js/index.js')

diff --git a/public/js/index.js b/public/js/index.js
index 79c2af0b..94ccc329 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -292,11 +292,19 @@ var statusLength = null;
 var statusKeymap = null;
 var statusIndent = null;
 
-$.get(serverurl + '/views/statusbar.html', function (template) {
-    statusBarTemplate = template;
-});
+function getStatusBarTemplate(callback) {
+    $.get(serverurl + '/views/statusbar.html', function (template) {
+        statusBarTemplate = template;
+        if (callback) callback();
+    });
+}
+getStatusBarTemplate();
 
 function addStatusBar() {
+    if (!statusBarTemplate) {
+        getStatusBarTemplate(addStatusBar);
+        return;
+    }
     statusBar = $(statusBarTemplate);
     statusCursor = statusBar.find('.status-cursor');
     statusFile = statusBar.find('.status-file');
@@ -1469,7 +1477,7 @@ socket.on('info', function (data) {
 });
 socket.on('error', function (data) {
     console.error(data);
-    if (data.message.indexOf('AUTH failed') === 0)
+    if (data.message && data.message.indexOf('AUTH failed') === 0)
         location.href = "./403";
 });
 socket.on('disconnect', function (data) {
-- 
cgit v1.2.3