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

Merge pull request #816 from csabahenk/viewhack 

Detect strftime year/month/day specifiers in weechat.look.buffer_time…
This commit is contained in:
Lorenz Hübschle-Schneider 2016-09-19 10:07:24 +02:00 committed by GitHub
parent a20a9b7dfb cc4d4bf20e
commit 1324beeb5e
1 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
js/connection.js
View File

@ -78,6 +78,11 @@ weechat.factory('connection',
}; };
var _parseWeechatTimeFormat = function() { var _parseWeechatTimeFormat = function() {
// helper function to get a custom delimiter span
var _timeDelimiter = function(delim) {
return "'<span class=\"cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters\">" + delim + "</span>'";
};
// Fetch the buffer time format from weechat // Fetch the buffer time format from weechat
var timeFormat = models.wconfig['weechat.look.buffer_time_format']; var timeFormat = models.wconfig['weechat.look.buffer_time_format'];
@ -88,7 +93,7 @@ weechat.factory('connection',
// one of four formats, (short|long) (12|24)-hour time // one of four formats, (short|long) (12|24)-hour time
var angularFormat = ""; var angularFormat = "";
var timeDelimiter = "'<span class=\"cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters\">:</span>'"; var timeDelimiter = _timeDelimiter(":");
var left12 = "hh" + timeDelimiter + "mm"; var left12 = "hh" + timeDelimiter + "mm";
var right12 = "'&nbsp;'a"; var right12 = "'&nbsp;'a";
@ -132,6 +137,41 @@ weechat.factory('connection',
angularFormat = short24; angularFormat = short24;
} }
// Assemble date format
var date_components = [];
// Check for day of month in time format
var day_pos = Math.max(timeFormat.indexOf("%d"),
timeFormat.indexOf("%e"));
date_components.push([day_pos, "dd"]);
// month of year?
var month_pos = timeFormat.indexOf("%m");
date_components.push([month_pos, "MM"]);
// year as well?
var year_pos = Math.max(timeFormat.indexOf("%y"),
timeFormat.indexOf("%Y"));
if (timeFormat.indexOf("%y") > -1) {
date_components.push([year_pos, "yy"]);
} else if (timeFormat.indexOf("%Y") > -1) {
date_components.push([year_pos, "yyyy"]);
}
// if there is a date, assemble it in the right order
if (date_components.length > 0) {
date_components.sort();
var format_array = [];
for (var i = 0; i < date_components.length; i++) {
if (date_components[i][0] == -1) continue;
format_array.push(date_components[i][1]);
}
// TODO: parse delimiter as well? For now, use '/' as it is
// more common internationally than '-'
var date_format = format_array.join(_timeDelimiter("/"));
angularFormat = date_format + _timeDelimiter("&nbsp;") + angularFormat;
}
$rootScope.angularTimeFormat = angularFormat; $rootScope.angularTimeFormat = angularFormat;
}; };