Commit 3eb85697 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett Committed by Mike Greiling

Correct merge conflicts

Fixed eslint failures
parent a569aa29
...@@ -47,7 +47,6 @@ require('./shortcuts_dashboard_navigation'); ...@@ -47,7 +47,6 @@ require('./shortcuts_dashboard_navigation');
require('./shortcuts_issuable'); require('./shortcuts_issuable');
require('./shortcuts_network'); require('./shortcuts_network');
require('vendor/jquery.nicescroll'); require('vendor/jquery.nicescroll');
require('vendor/date.format');
requireAll(require.context('./behaviors', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./behaviors', false, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./blob', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./blob', false, /^\.\/.*\.(js|es6)$/));
requireAll(require.context('./templates', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./templates', false, /^\.\/.*\.(js|es6)$/));
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* global dateFormat */ /* global dateFormat */
window.timeago = require('vendor/timeago'); window.timeago = require('vendor/timeago');
require('vendor/date.format'); window.dateFormat = require('vendor/date.format');
(function() { (function() {
(function(w) { (function(w) {
...@@ -17,7 +17,7 @@ require('vendor/date.format'); ...@@ -17,7 +17,7 @@ require('vendor/date.format');
w.gl.utils.days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; w.gl.utils.days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
w.gl.utils.formatDate = function(datetime) { w.gl.utils.formatDate = function(datetime) {
return (new Date(datetime)).format('mmm d, yyyy h:MMtt Z'); return dateFormat(datetime, 'mmm d, yyyy h:MMtt Z');
}; };
w.gl.utils.getDayName = function(date) { w.gl.utils.getDayName = function(date) {
......
...@@ -11,115 +11,122 @@ ...@@ -11,115 +11,122 @@
* The date defaults to the current date/time. * The date defaults to the current date/time.
* The mask defaults to dateFormat.masks.default. * The mask defaults to dateFormat.masks.default.
*/ */
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
(global.dateFormat = factory());
}(this, (function () { 'use strict';
var dateFormat = function () {
var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
timezoneClip = /[^-+\dA-Z]/g,
pad = function (val, len) {
val = String(val);
len = len || 2;
while (val.length < len) val = "0" + val;
return val;
};
var dateFormat = function () { // Regexes and supporting functions are cached through closure
var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g, return function (date, mask, utc) {
timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g, var dF = dateFormat;
timezoneClip = /[^-+\dA-Z]/g,
pad = function (val, len) {
val = String(val);
len = len || 2;
while (val.length < len) val = "0" + val;
return val;
};
// Regexes and supporting functions are cached through closure // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
return function (date, mask, utc) { if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
var dF = dateFormat; mask = date;
date = undefined;
}
// You can't provide utc if you skip other args (use the "UTC:" mask prefix) // Passing date through Date applies Date.parse, if necessary
if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) { date = date ? new Date(date) : new Date;
mask = date; if (isNaN(date)) throw SyntaxError("invalid date");
date = undefined;
}
// Passing date through Date applies Date.parse, if necessary mask = String(dF.masks[mask] || mask || dF.masks["default"]);
date = date ? new Date(date) : new Date;
if (isNaN(date)) throw SyntaxError("invalid date");
mask = String(dF.masks[mask] || mask || dF.masks["default"]); // Allow setting the utc argument via the mask
if (mask.slice(0, 4) == "UTC:") {
mask = mask.slice(4);
utc = true;
}
// Allow setting the utc argument via the mask var _ = utc ? "getUTC" : "get",
if (mask.slice(0, 4) == "UTC:") { d = date[_ + "Date"](),
mask = mask.slice(4); D = date[_ + "Day"](),
utc = true; m = date[_ + "Month"](),
} y = date[_ + "FullYear"](),
H = date[_ + "Hours"](),
M = date[_ + "Minutes"](),
s = date[_ + "Seconds"](),
L = date[_ + "Milliseconds"](),
o = utc ? 0 : date.getTimezoneOffset(),
flags = {
d: d,
dd: pad(d),
ddd: dF.i18n.dayNames[D],
dddd: dF.i18n.dayNames[D + 7],
m: m + 1,
mm: pad(m + 1),
mmm: dF.i18n.monthNames[m],
mmmm: dF.i18n.monthNames[m + 12],
yy: String(y).slice(2),
yyyy: y,
h: H % 12 || 12,
hh: pad(H % 12 || 12),
H: H,
HH: pad(H),
M: M,
MM: pad(M),
s: s,
ss: pad(s),
l: pad(L, 3),
L: pad(L > 99 ? Math.round(L / 10) : L),
t: H < 12 ? "a" : "p",
tt: H < 12 ? "am" : "pm",
T: H < 12 ? "A" : "P",
TT: H < 12 ? "AM" : "PM",
Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
};
var _ = utc ? "getUTC" : "get", return mask.replace(token, function ($0) {
d = date[_ + "Date"](), return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
D = date[_ + "Day"](), });
m = date[_ + "Month"](), };
y = date[_ + "FullYear"](), }();
H = date[_ + "Hours"](),
M = date[_ + "Minutes"](),
s = date[_ + "Seconds"](),
L = date[_ + "Milliseconds"](),
o = utc ? 0 : date.getTimezoneOffset(),
flags = {
d: d,
dd: pad(d),
ddd: dF.i18n.dayNames[D],
dddd: dF.i18n.dayNames[D + 7],
m: m + 1,
mm: pad(m + 1),
mmm: dF.i18n.monthNames[m],
mmmm: dF.i18n.monthNames[m + 12],
yy: String(y).slice(2),
yyyy: y,
h: H % 12 || 12,
hh: pad(H % 12 || 12),
H: H,
HH: pad(H),
M: M,
MM: pad(M),
s: s,
ss: pad(s),
l: pad(L, 3),
L: pad(L > 99 ? Math.round(L / 10) : L),
t: H < 12 ? "a" : "p",
tt: H < 12 ? "am" : "pm",
T: H < 12 ? "A" : "P",
TT: H < 12 ? "AM" : "PM",
Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
};
return mask.replace(token, function ($0) { // Some common format strings
return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1); dateFormat.masks = {
}); "default": "ddd mmm dd yyyy HH:MM:ss",
shortDate: "m/d/yy",
mediumDate: "mmm d, yyyy",
longDate: "mmmm d, yyyy",
fullDate: "dddd, mmmm d, yyyy",
shortTime: "h:MM TT",
mediumTime: "h:MM:ss TT",
longTime: "h:MM:ss TT Z",
isoDate: "yyyy-mm-dd",
isoTime: "HH:MM:ss",
isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
}; };
}();
// Some common format strings // Internationalization strings
dateFormat.masks = { dateFormat.i18n = {
"default": "ddd mmm dd yyyy HH:MM:ss", dayNames: [
shortDate: "m/d/yy", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
mediumDate: "mmm d, yyyy", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
longDate: "mmmm d, yyyy", ],
fullDate: "dddd, mmmm d, yyyy", monthNames: [
shortTime: "h:MM TT", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
mediumTime: "h:MM:ss TT", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
longTime: "h:MM:ss TT Z", ]
isoDate: "yyyy-mm-dd", };
isoTime: "HH:MM:ss",
isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
};
// Internationalization strings // For convenience...
dateFormat.i18n = { Date.prototype.format = function (mask, utc) {
dayNames: [ return dateFormat(this, mask, utc);
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", };
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
],
monthNames: [
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
]
};
// For convenience... return dateFormat;
Date.prototype.format = function (mask, utc) { })));
return dateFormat(this, mask, utc);
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment