Fix new loading screen errors

customize.dist/loading.js

@@ -175,32 +175,6 @@ p.cp-password-info{
 #cp-loading .cp-loading-spinner-container > div {
   height: 100px;
 }
-#cp-loading-tip {
-  position: fixed;
-  z-index: 10000000;
-  top: 80%;
-  left: 0;
-  right: 0;
-  text-align: center;
-  transition: opacity 750ms;
-  transition-delay: 3000ms;
-}
-@media screen and (max-height: 600px) {
-  #cp-loading-tip {
-    display: none;
-  }
-}
-#cp-loading-tip span {
-  background: #222;
-  color: #fafafa;
-  text-align: center;
-  font-size: 1.3em;
-  opacity: 0.7;
-  font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
-  padding: 15px;
-  max-width: 60%;
-  display: inline-block;
-}
 .cp-loading-progress {
     width: 100%;
     margin: 20px;
@@ -340,6 +314,7 @@ button.primary:hover{
         var c = types.indexOf(data.type);
         if (c < current) { return console.error(data); }
         try {
+            document.querySelector('.cp-loading-spinner-container').style.display = 'none';
             document.querySelector('.cp-loading-progress-list').innerHTML = makeList(data);
             document.querySelector('.cp-loading-progress-container').innerHTML = makeBar(data);
         } catch (e) { console.error(e); }

www/common/common-interface.js

@@ -932,35 +932,33 @@ define([
 
     var LOADING = 'cp-loading';
 
-    var loading = {
-        error: false,
-        driveState: 0,
-        padState: 0
-    };
     UI.addLoadingScreen = function (config) {
         config = config || {};
         var loadingText = config.loadingText;
         var todo = function () {
             var $loading = $('#' + LOADING);
+            // Show the loading screen
             $loading.css('display', '');
             $loading.removeClass('cp-loading-hidden');
-            $('.cp-loading-spinner-container').show();
+            if (config.newProgress) {
-            if (!config.noProgress && !$loading.find('.cp-loading-progress').length) {
+                // XXX re-add progress bar for step 6 after password prompt for PPP
+                // XXX also burn after reading
                 var progress = h('div.cp-loading-progress', [
-                    h('p.cp-loading-progress-drive'),
+                    h('p.cp-loading-progress-list'),
-                    h('p.cp-loading-progress-pad')
+                    h('p.cp-loading-progress-container')
                 ]);
-                $(progress).hide();
+                $loading.find('.cp-loading-spinner-container').after(progress);
-                $loading.find('.cp-loading-container').append(progress);
+            }
-            } else if (config.noProgress) {
+            if (!$loading.find('.cp-loading-progress').length) {
-                $loading.find('.cp-loading-progress').remove();
+                // Add spinner
+                $('.cp-loading-spinner-container').show();
             }
+            // Add loading text
             if (loadingText) {
                 $('#' + LOADING).find('#cp-loading-message').show().text(loadingText);
             } else {
                 $('#' + LOADING).find('#cp-loading-message').hide().text('');
             }
-            loading.error = false;
         };
         if ($('#' + LOADING).length) {
             todo();
@@ -973,60 +971,6 @@ define([
         if (window.CryptPad_updateLoadingProgress) {
             window.CryptPad_updateLoadingProgress(data);
         }
-        // XXX
-        /*
-        var $loading = $('#' + LOADING);
-        if (!$loading.length || loading.error) { return; }
-        $loading.find('.cp-loading-progress').show();
-        var $progress;
-        if (isDrive) {
-            // Drive state
-            if (loading.driveState === -1) { return; } // Already loaded
-            $progress = $loading.find('.cp-loading-progress-drive');
-            if (!$progress.length) { return; } // Can't find the box to display data
-
-            // If state is -1, remove the box, drive is loaded
-            if (data.state === -1) {
-                loading.driveState = -1;
-                $progress.remove();
-            } else {
-                if (data.state < loading.driveState) { return; } // We should not display old data
-                // Update the current state
-                loading.driveState = data.state;
-                data.progress = data.progress || 100;
-                data.msg = Messages['loading_drive_'+ Math.floor(data.state)] || '';
-                $progress.html(data.msg);
-                if (data.progress) {
-                    $progress.append(h('div.cp-loading-progress-bar', [
-                        h('div.cp-loading-progress-bar-value', {style: 'width:'+data.progress+'%;'})
-                    ]));
-                }
-            }
-        } else {
-            // Pad state
-            if (loading.padState === -1) { return; } // Already loaded
-            $progress = $loading.find('.cp-loading-progress-pad');
-            if (!$progress.length) { return; } // Can't find the box to display data
-
-            // If state is -1, remove the box, pad is loaded
-            if (data.state === -1) {
-                loading.padState = -1;
-                $progress.remove();
-            } else {
-                if (data.state < loading.padState) { return; } // We should not display old data
-                // Update the current state
-                loading.padState = data.state;
-                data.progress = data.progress || 100;
-                data.msg = Messages['loading_pad_'+data.state] || '';
-                $progress.html(data.msg);
-                if (data.progress) {
-                    $progress.append(h('div.cp-loading-progress-bar', [
-                        h('div.cp-loading-progress-bar-value', {style: 'width:'+data.progress+'%;'})
-                    ]));
-                }
-            }
-        }
-        */
     };
     UI.removeLoadingScreen = function (cb) {
         // Release the test blocker, hopefully every test has been registered.
@@ -1034,31 +978,23 @@ define([
         cb = cb || function () {};
         if (Test.__ASYNC_BLOCKER__) { Test.__ASYNC_BLOCKER__.pass(); }
 
-        $('#' + LOADING).addClass("cp-loading-hidden");
+        var $loading = $('#' + LOADING);
+        $loading.addClass("cp-loading-hidden"); // Hide the loading screen
+        $loading.find('.cp-loading-progress').remove(); // Remove the progress list
         setTimeout(cb, 750);
-        loading.error = false;
-        var $tip = $('#cp-loading-tip').css('top', '')
-        // loading.less sets transition-delay: $wait-time
-        // and               transition: opacity $fadeout-time
-            .css({
-                'opacity': 0,
-                'pointer-events': 'none',
-            });
-        window.setTimeout(function () {
-            $tip.remove();
-        }, 3750);
-        // jquery.fadeout can get stuck
     };
     UI.errorLoadingScreen = function (error, transparent, exitable) {
         var $loading = $('#' + LOADING);
         if (!$loading.is(':visible') || $loading.hasClass('cp-loading-hidden')) {
-            UI.addLoadingScreen({hideTips: true});
+            UI.addLoadingScreen();
         }
-        loading.error = true;
+        // Remove the progress list
         $loading.find('.cp-loading-progress').remove();
+        // Hide the spinner
         $('.cp-loading-spinner-container').hide();
-        $('#cp-loading-tip').remove();
         if (transparent) { $loading.css('opacity', 0.9); }
+
+        // Add the error message
         var $error = $loading.find('#cp-loading-message').show();
         if (error instanceof Element) {
             $error.html('').append(error);
@@ -1070,7 +1006,6 @@ define([
             $(window).keydown(function (e) {
                 if (e.which === 27) {
                     $loading.hide();
-                    loading.error = false;
                     if (typeof(exitable) === "function") { exitable(); }
                 }
             });

www/common/common-ui-elements.js

@@ -2532,10 +2532,16 @@ define([
 
         var submit = function () {
             var value = $password.find('.cp-password-input').val();
-            UI.addLoadingScreen();
+            UI.addLoadingScreen({newProgress: true});
+            if (window.CryptPad_updateLoadingProgress) {
+                window.CryptPad_updateLoadingProgress({
+                    type: 'pad',
+                    progress: 0
+                });
+            }
             common.getSframeChannel().query('Q_PAD_PASSWORD_VALUE', value, function (err, data) {
                 if (!data) {
-                    UIElements.displayPasswordPrompt(common, cfg, true);
+                    return void UIElements.displayPasswordPrompt(common, cfg, true);
                 }
             });
         };

www/common/sframe-common.js

@@ -345,7 +345,13 @@ define([
         }
         if (priv.burnAfterReading) {
             UIElements.displayBurnAfterReadingPage(funcs, waitFor(function () {
-                UI.addLoadingScreen();
+                UI.addLoadingScreen({newProgress: true});
+                if (window.CryptPad_updateLoadingProgress) {
+                    window.CryptPad_updateLoadingProgress({
+                        type: 'pad',
+                        progress: 0
+                    });
+                }
                 ctx.sframeChan.event('EV_BURN_AFTER_READING');
             }));
         }