From 854ab77f14e657f5f22ccbf805cb7206f2292895 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 15 Oct 2020 14:58:56 +0200
Subject: [PATCH] More improvements

---
 customize.dist/loading.js                   | 5 +++--
 www/common/LessLoader.js                    | 2 +-
 www/common/sframe-chainpad-netflux-inner.js | 7 +++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/customize.dist/loading.js b/customize.dist/loading.js
index 38eae2515..338b5882e 100644
--- a/customize.dist/loading.js
+++ b/customize.dist/loading.js
@@ -297,7 +297,7 @@ button.primary:hover{
     var built = false;
 
     // XXX
-    var types = ['less', 'drive', 'migrate', 'sf', 'team', 'pad'];
+    var types = ['less', 'drive', 'migrate', 'sf', 'team', 'pad', 'end'];
     Messages.loading_state_0 = "Less";
     Messages.loading_state_1 = "Drive";
     Messages.loading_state_2 = "Migrate";
@@ -309,7 +309,7 @@ button.primary:hover{
         var c = types.indexOf(data.type);
         current = c;
         var getLi = function (i) {
-            var check = (i < c || (i === c && data.progress === 100)) ? 'fa-check-square-o'
+            var check = (i < c || (i === c && data.progress >= 100)) ? 'fa-check-square-o'
                                                                       : 'fa-square-o';
             var p = Math.min(Math.floor(data.progress), 100);
             var percent = i < c ? '(100%)' : (i === c ? '('+p+'%)' : '(0%)');
@@ -318,6 +318,7 @@ button.primary:hover{
         };
         var list = '<ul>';
         types.forEach(function (el, i) {
+            if (i >= 6) { return; }
             list += getLi(i);
         });
         list += '</ul>';
diff --git a/www/common/LessLoader.js b/www/common/LessLoader.js
index 0a8a1e914..5b52b3d2c 100644
--- a/www/common/LessLoader.js
+++ b/www/common/LessLoader.js
@@ -167,7 +167,7 @@ define([
         if (window.CryptPad_updateLoadingProgress) {
             window.CryptPad_updateLoadingProgress({
                 type: 'less',
-                progress: idx++
+                progress: 4*idx++
             });
         }
         cacheGet(url, function (css) {
diff --git a/www/common/sframe-chainpad-netflux-inner.js b/www/common/sframe-chainpad-netflux-inner.js
index 8e8bb84f2..abb1cebdf 100644
--- a/www/common/sframe-chainpad-netflux-inner.js
+++ b/www/common/sframe-chainpad-netflux-inner.js
@@ -149,6 +149,13 @@ define([
         });
         sframeChan.on('EV_RT_READY', function () {
             if (isReady) { return; }
+            if (updateLoadingProgress) {
+                updateLoadingProgress({
+                    type: 'end',
+                    progress: 0
+                }, false);
+                isHistory++;
+            }
             isReady = true;
             isHistory = false;
             chainpad.start();