Handle infinite-spinner errors and properly inform the user

This commit is contained in:
Caleb James DeLisle
2017-08-25 14:24:43 +02:00
parent cbf63b4c52
commit 0a6f81850f
5 changed files with 50 additions and 18 deletions

View File

@@ -33,6 +33,7 @@ define([
'/bower_components/nthen/index.js',
'/common/sframe-common.js',
'/api/config',
'/common/common-realtime.js',
'/bower_components/file-saver/FileSaver.min.js',
'/bower_components/diff-dom/diffDOM.js',
@@ -41,8 +42,24 @@ define([
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
'less!/customize/src/less/cryptpad.less',
'less!/customize/src/less/toolbar.less'
], function ($, Crypto, Hyperjson,
Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher, Cryptpad, Cryptget, Links, nThen, SFCommon, ApiConfig) {
], function (
$,
Crypto,
Hyperjson,
Toolbar,
Cursor,
JsonOT,
TypingTest,
JSONSortify,
TextPatcher,
Cryptpad,
Cryptget,
Links,
nThen,
SFCommon,
ApiConfig,
CommonRealtime)
{
var saveAs = window.saveAs;
var Messages = Cryptpad.Messages;
var DiffDom = window.diffDOM;
@@ -322,6 +339,8 @@ define([
}
};
CommonRealtime.onInfiniteSpinner(function () { setEditable(false); });
// don't let the user edit until the pad is ready
setEditable(false);