Skip to content

Commit

Permalink
Clear outstanding alerts when synchronisation is restored
Browse files Browse the repository at this point in the history
  • Loading branch information
Jermolene committed Dec 6, 2019
1 parent a4b8551 commit 9f5c0de
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
6 changes: 5 additions & 1 deletion core/modules/syncer.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ Update the document body with the class "tc-dirty" if the wiki has unsaved/unsyn
*/
Syncer.prototype.updateDirtyStatus = function() {
if($tw.browser && !this.disableUI) {
$tw.utils.toggleClass(document.body,"tc-dirty",this.isDirty());
var dirty = this.isDirty();
$tw.utils.toggleClass(document.body,"tc-dirty",dirty);
if(!dirty) {
this.logger.clearAlerts();
}
}
};

Expand Down
14 changes: 14 additions & 0 deletions core/modules/utils/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ function Logger(componentName,options) {
this.save = "save" in options ? options.save : true;
this.saveLimit = options.saveLimit || 100 * 1024;
this.buffer = "";
this.alertCount = 0;
}

/*
Expand Down Expand Up @@ -91,6 +92,7 @@ Logger.prototype.alert = function(/* args */) {
component: this.componentName
};
existingCount = 0;
this.alertCount += 1;
}
alertFields.modified = new Date();
if(++existingCount > 1) {
Expand All @@ -108,6 +110,18 @@ Logger.prototype.alert = function(/* args */) {
}
};

/*
Clear outstanding alerts
*/
Logger.prototype.clearAlerts = function() {
if(this.alertCount > 0) {
$tw.utils.each($tw.wiki.getTiddlersWithTag(ALERT_TAG),function(title) {
$tw.wiki.deleteTiddler(title);
});
this.alertCount = 0;
}
};

exports.Logger = Logger;

})();

0 comments on commit 9f5c0de

Please sign in to comment.