suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert some private Zotero.Date methods to privileged

Browse Source
This commit is contained in:
Dan Stillman 2017-01-09 04:20:10 -05:00
parent 9fbdc77cac
commit 7bdcc17ed0
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
chrome/content/zotero/xpcom/date.js
View File

@ -24,12 +24,6 @@
*/ */
Zotero.Date = new function(){ Zotero.Date = new function(){
this.sqlToDate = sqlToDate;
this.dateToSQL = dateToSQL;
this.strToDate = strToDate;
this.formatDate = formatDate;
this.strToISO = strToISO;
this.strToMultipart = strToMultipart;
this.isMultipart = isMultipart; this.isMultipart = isMultipart;
this.multipartToSQL = multipartToSQL; this.multipartToSQL = multipartToSQL;
this.multipartToStr = multipartToStr; this.multipartToStr = multipartToStr;
@ -85,7 +79,7 @@ Zotero.Date = new function(){
* *
* Can also accept just the date part (e.g. '2006-06-13') * Can also accept just the date part (e.g. '2006-06-13')
**/ **/
function sqlToDate(sqldate, isUTC){ this.sqlToDate = function (sqldate, isUTC) {
try { try {
if (!this.isSQLDate(sqldate) && !this.isSQLDateTime(sqldate)) { if (!this.isSQLDate(sqldate) && !this.isSQLDateTime(sqldate)) {
throw new Error("Invalid date"); throw new Error("Invalid date");
@ -125,8 +119,7 @@ Zotero.Date = new function(){
* *
* If _toUTC_ is true, creates a UTC date * If _toUTC_ is true, creates a UTC date
**/ **/
function dateToSQL(date, toUTC) this.dateToSQL = function (date, toUTC) {
{
try { try {
if (toUTC){ if (toUTC){
var year = date.getUTCFullYear(); var year = date.getUTCFullYear();
@ -250,7 +243,7 @@ Zotero.Date = new function(){
var _monthRe = null; var _monthRe = null;
var _dayRe = null; var _dayRe = null;
function strToDate(string) { this.strToDate = function (string) {
var date = { var date = {
order: '' order: ''
}; };
@ -265,13 +258,13 @@ Zotero.Date = new function(){
// Parse 'yesterday'/'today'/'tomorrow' // Parse 'yesterday'/'today'/'tomorrow'
var lc = (string + '').toLowerCase(); var lc = (string + '').toLowerCase();
if (lc == 'yesterday' || (Zotero.getString && lc === Zotero.getString('date.yesterday'))) { if (lc == 'yesterday' || (Zotero.getString && lc === Zotero.getString('date.yesterday'))) {
string = Zotero.Date.dateToSQL(new Date(Date.now() - 1000*60*60*24)).substr(0, 10); string = this.dateToSQL(new Date(Date.now() - 1000*60*60*24)).substr(0, 10);
} }
else if (lc == 'today' || (Zotero.getString && lc == Zotero.getString('date.today'))) { else if (lc == 'today' || (Zotero.getString && lc == Zotero.getString('date.today'))) {
string = Zotero.Date.dateToSQL(new Date()).substr(0, 10); string = this.dateToSQL(new Date()).substr(0, 10);
} }
else if (lc == 'tomorrow' || (Zotero.getString && lc == Zotero.getString('date.tomorrow'))) { else if (lc == 'tomorrow' || (Zotero.getString && lc == Zotero.getString('date.tomorrow'))) {
string = Zotero.Date.dateToSQL(new Date(Date.now() + 1000*60*60*24)).substr(0, 10); string = this.dateToSQL(new Date(Date.now() + 1000*60*60*24)).substr(0, 10);
} }
else { else {
string = string.toString().replace(/^\s+|\s+$/g, "").replace(/\s+/, " "); string = string.toString().replace(/^\s+|\s+$/g, "").replace(/\s+/, " ");
@ -396,14 +389,9 @@ Zotero.Date = new function(){
// MONTH // MONTH
if(date.month === undefined) { if(date.month === undefined) {
// compile month regular expression // compile month regular expression
var months = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', let months = this.getMonths(true);
'aug', 'sep', 'oct', 'nov', 'dec']; months = months.short.map(m => m.toLowerCase())
// If using a non-English bibliography locale, try those too .concat(months.long.map(m => m.toLowerCase()));
if (Zotero.locale != 'en-US') {
Zotero.Date.getMonths();
months = months.concat(_months['short']).concat(_months['long']);
for(var i=0, n=months.length; i<n; i++) months[i] = months[i].toLowerCase();
}
if(!_monthRe) { if(!_monthRe) {
_monthRe = new RegExp("^(.*)\\b("+months.join("|")+")[^ ]*(?: (.*)$|$)", "i"); _monthRe = new RegExp("^(.*)\\b("+months.join("|")+")[^ ]*(?: (.*)$|$)", "i");
@ -563,7 +551,7 @@ Zotero.Date = new function(){
* @return A formatted date string * @return A formatted date string
* @type String * @type String
**/ **/
function formatDate(date, shortFormat) { this.formatDate = function (date, shortFormat) {
if(shortFormat) { if(shortFormat) {
var localeDateOrder = getLocaleDateOrder(); var localeDateOrder = getLocaleDateOrder();
var string = localeDateOrder[0]+"/"+localeDateOrder[1]+"/"+localeDateOrder[2]; var string = localeDateOrder[0]+"/"+localeDateOrder[1]+"/"+localeDateOrder[2];
@ -577,7 +565,7 @@ Zotero.Date = new function(){
string += date.part+" "; string += date.part+" ";
} }
var months = Zotero.Date.getMonths().long; var months = this.getMonths().long;
if(date.month != undefined && months[date.month]) { if(date.month != undefined && months[date.month]) {
// get short month strings from CSL interpreter // get short month strings from CSL interpreter
string += months[date.month]; string += months[date.month];
@ -596,8 +584,8 @@ Zotero.Date = new function(){
return string; return string;
} }
function strToISO(str) { this.strToISO = function (str) {
var date = Zotero.Date.strToDate(str); var date = this.strToDate(str);
if(date.year) { if(date.year) {
var dateString = Zotero.Utilities.lpad(date.year, "0", 4); var dateString = Zotero.Utilities.lpad(date.year, "0", 4);
@ -635,12 +623,12 @@ Zotero.Date = new function(){
return date; return date;
} }
function strToMultipart(str){ this.strToMultipart = function (str) {
if (!str){ if (!str){
return ''; return '';
} }
var parts = strToDate(str); var parts = this.strToDate(str);
// FIXME: Until we have a better BCE date solution, // FIXME: Until we have a better BCE date solution,
// remove year value if not between 1 and 9999 // remove year value if not between 1 and 9999