Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

syncing used instead of saving while logged in #601

Merged
merged 2 commits into from
Jan 23, 2018
Merged

syncing used instead of saving while logged in #601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f1c46d
syncing used instead of saving while logged in
himanish-star Jan 22, 2018
55566fa
@natim review.
Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/sidebar/panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,12 @@ ClassicEditor.create(document.querySelector('#editor'), {
setAnimation(true); // animateSyncIcon, syncingLayout, warning
syncingInProcess = true;
}
if (! waitingToReconnect) {
savingIndicator.textContent = browser.i18n.getMessage('savingChanges');
if (!waitingToReconnect) {
if (isAuthenticated) {
savingIndicator.textContent = browser.i18n.getMessage('syncProgress');
} else {
savingIndicator.textContent = browser.i18n.getMessage('savingChanges');
}
}
// Disable sync-action
editingInProcess = true;
Expand All @@ -139,7 +143,7 @@ ClassicEditor.create(document.querySelector('#editor'), {
syncingInProcess = false;
break;
case 'text-saved':
if (! waitingToReconnect) {
if (! waitingToReconnect && ! isAuthenticated) {
// persist reconnect warning, do not override with the 'saved at'
savingIndicator.textContent = browser.i18n.getMessage('savedComplete2', formatFooterTime());
}
Expand Down Expand Up @@ -285,7 +289,7 @@ function getLastSyncedTime() {
isAuthenticated = true;
setAnimation(false, true);
} else {
savingIndicator.textContent = browser.i18n.getMessage('savedComplete2', formatFooterTime());
savingIndicator.textContent = browser.i18n.getMessage('changesSaved', formatFooterTime());
}
}

Expand Down