Merge c4c6d81a39
into ee6946dca7
commit
5206ae1969
|
@ -637,6 +637,7 @@
|
||||||
var that = this
|
var that = this
|
||||||
,options = that.config
|
,options = that.config
|
||||||
,dateType = 'yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s'
|
,dateType = 'yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s'
|
||||||
|
,safeType = '\\w'
|
||||||
,isStatic = options.position === 'static'
|
,isStatic = options.position === 'static'
|
||||||
,format = {
|
,format = {
|
||||||
year: 'yyyy'
|
year: 'yyyy'
|
||||||
|
@ -685,7 +686,7 @@
|
||||||
if(/^y$/.test(item)) return '1,308';
|
if(/^y$/.test(item)) return '1,308';
|
||||||
return '1,2';
|
return '1,2';
|
||||||
}() +'}'
|
}() +'}'
|
||||||
: '\\' + item;
|
: new RegExp(safeType).test(item) ? '' + item : '\\' + item;
|
||||||
that.EXP_IF = that.EXP_IF + EXP;
|
that.EXP_IF = that.EXP_IF + EXP;
|
||||||
that.EXP_SPLIT = that.EXP_SPLIT + '(' + EXP + ')';
|
that.EXP_SPLIT = that.EXP_SPLIT + '(' + EXP + ')';
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue