web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a FontAwesome spinner to replace the old unaligned one

Browse Source
This commit is contained in:
yflory
2017-01-12 17:05:16 +01:00
parent 6352656737
commit 29c8f0bbef
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
www/common/toolbar.js
View File

@@ -43,7 +43,6 @@ define([
var LOCALSTORAGE_DISALLOW = Bar.constants.localstorageDisallow = 'cryptpad-disallow';
var SPINNER_DISAPPEAR_TIME = 3000;
var SPINNER = [ '-', '\\', '|', '/' ];
var uid = function () {
return 'cryptpad-uid-' + String(Math.random()).substring(2);
@@ -80,21 +79,19 @@ define([
};
var createSpinner = function ($container) {
var $spinner = $('<div>', {
var $spinner = $('<span>', {
id: uid(),
'class': SPINNER_CLS,
});
'class': SPINNER_CLS + ' fa fa fa-spinner fa-pulse',
}).hide();
$container.prepend($spinner);
return $spinner[0];
};
var kickSpinner = function (spinnerElement, reversed) {
var txt = spinnerElement.textContent || '-';
var inc = (reversed) ? -1 : 1;
spinnerElement.textContent = SPINNER[(SPINNER.indexOf(txt) + inc) % SPINNER.length];
var kickSpinner = function (spinnerElement) {
$(spinnerElement).show();
if (spinnerElement.timeout) { clearTimeout(spinnerElement.timeout); }
spinnerElement.timeout = setTimeout(function () {
spinnerElement.textContent = '';
$(spinnerElement).hide();
}, SPINNER_DISAPPEAR_TIME);
};
@@ -616,7 +613,7 @@ define([
}
var ks = function () {
if (connected) { kickSpinner(spinner, false); }
if (connected) { kickSpinner(spinner); }
};
realtime.onPatch(ks);