masq/glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #730 from pmelanson/705-date-change-under-read-marker

Browse Source 
#705 bugfix datechange injected under read marker
This commit is contained in:
Lorenz Hübschle-Schneider 2016-01-09 09:48:57 +01:00
commit baf4d1bc32
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/handlers.js
View File

@ -41,7 +41,7 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
}; };
// inject a fake buffer line for date change if needed // inject a fake buffer line for date change if needed
var injectDateChangeMessageIfNeeded = function(buffer, old_date, new_date) { var injectDateChangeMessageIfNeeded = function(buffer, manually, old_date, new_date) {
if (buffer.bufferType === 1) { if (buffer.bufferType === 1) {
// Don't add date change messages to free buffers // Don't add date change messages to free buffers
return; return;
@ -50,7 +50,12 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
new_date.setHours(0, 0, 0, 0); new_date.setHours(0, 0, 0, 0);
// Check if the date changed // Check if the date changed
if (old_date.valueOf() !== new_date.valueOf()) { if (old_date.valueOf() !== new_date.valueOf()) {
++buffer.lastSeen; if (manually) {
// if the message that caused this date change to be sent
// would increment buffer.lastSeen, we should increment as
// well.
++buffer.lastSeen;
}
var old_date_plus_one = old_date; var old_date_plus_one = old_date;
old_date_plus_one.setDate(old_date.getDate() + 1); old_date_plus_one.setDate(old_date.getDate() + 1);
// it's not always true that a date with time 00:00:00 // it's not always true that a date with time 00:00:00
@ -141,7 +146,7 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
if (buffer.lines.length > 0) { if (buffer.lines.length > 0) {
var old_date = new Date(buffer.lines[buffer.lines.length - 1].date), var old_date = new Date(buffer.lines[buffer.lines.length - 1].date),
new_date = new Date(message.date); new_date = new Date(message.date);
injectDateChangeMessageIfNeeded(buffer, old_date, new_date); injectDateChangeMessageIfNeeded(buffer, manually, old_date, new_date);
} }
message = plugins.PluginManager.contentForMessage(message); message = plugins.PluginManager.contentForMessage(message);
@ -326,7 +331,7 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
var buffer = models.getBuffer(last_line.buffer); var buffer = models.getBuffer(last_line.buffer);
if (buffer.lines.length > 0) { if (buffer.lines.length > 0) {
var last_date = new Date(buffer.lines[buffer.lines.length - 1].date); var last_date = new Date(buffer.lines[buffer.lines.length - 1].date);
injectDateChangeMessageIfNeeded(buffer, last_date, new Date()); injectDateChangeMessageIfNeeded(buffer, true, last_date, new Date());
} }
} }
}; };