From 1958bca98491118a22abdcee8faacedaf4a4392f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 7 Sep 2017 16:48:17 +0200
Subject: [PATCH] restore hashing screen in login and register

---
 www/login/main.js    | 10 ++++++++--
 www/register/main.js | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/www/login/main.js b/www/login/main.js
index 7d0a21036..ac4baf860 100644
--- a/www/login/main.js
+++ b/www/login/main.js
@@ -1,7 +1,10 @@
 define([
     'jquery',
     '/common/cryptpad-common.js',
-    '/common/login.js'
+    '/common/login.js',
+
+    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/customize/src/less/loading.less',
 ], function ($, Cryptpad, Login) {
     $(function () {
         var $main = $('#mainBlock');
@@ -72,7 +75,10 @@ define([
 
             // setTimeout 100ms to remove the keyboard on mobile devices before the loading screen pops up
             window.setTimeout(function () {
-                Cryptpad.addLoadingScreen({loadingText: Messages.login_hashing});
+                Cryptpad.addLoadingScreen({
+                    loadingText: Messages.login_hashing,
+                    hideTips: true,
+                });
                 // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
                 window.setTimeout(function () {
                     loginReady(function () {
diff --git a/www/register/main.js b/www/register/main.js
index f01a4ef8d..ce7c53242 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -4,6 +4,9 @@ define([
     '/common/cryptpad-common.js',
     '/common/test.js',
     '/common/credential.js', // preloaded for login.js
+
+    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/customize/src/less/loading.less',
 ], function ($, Login, Cryptpad, Test) {
     var Messages = Cryptpad.Messages;
 
@@ -128,7 +131,10 @@ define([
                 registering = true;
                 // setTimeout 100ms to remove the keyboard on mobile devices before the loading screen pops up
                 window.setTimeout(function () {
-                    Cryptpad.addLoadingScreen({loadingText: Messages.login_hashing});
+                    Cryptpad.addLoadingScreen({
+                        loadingText: Messages.login_hashing,
+                        hideTips: true,
+                    });
                     // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
                     window.setTimeout(function () {
                         Login.loginOrRegister(uname, passwd, true, function (err, result) {
@@ -193,7 +199,7 @@ define([
                             logMeIn(result);
                         });
                     }, 0);
-                }, 100);
+                }, 200);
             }, {
                 ok: Messages.register_writtenPassword,
                 cancel: Messages.register_cancel,