Merge branch 'v3'
This commit is contained in:
commit
93c5ecae9c
@ -16531,18 +16531,18 @@
|
|||||||
if (this.isClone) {
|
if (this.isClone) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
return this.nodes.date.textContent = Time.funk(this.info.date);
|
return this.nodes.date.textContent = Time.funk(Time, this.info.date);
|
||||||
},
|
},
|
||||||
createFunc: function(format) {
|
createFunc: function(format) {
|
||||||
var code;
|
var code;
|
||||||
code = format.replace(/%([A-Za-z])/g, function(s, c) {
|
code = format.replace(/%([A-Za-z])/g, function(s, c) {
|
||||||
if (c in Time.formatters) {
|
if (c in Time.formatters) {
|
||||||
return "' + this.formatters." + c + ".call(date) + '";
|
return "' + Time.formatters." + c + ".call(date) + '";
|
||||||
} else {
|
} else {
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return Function('date', "return '" + code + "'");
|
return Function('Time', 'date', "return '" + code + "'");
|
||||||
},
|
},
|
||||||
day: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
|
day: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
|
||||||
month: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
|
month: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
|
||||||
|
|||||||
@ -16551,18 +16551,18 @@
|
|||||||
if (this.isClone) {
|
if (this.isClone) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
return this.nodes.date.textContent = Time.funk(this.info.date);
|
return this.nodes.date.textContent = Time.funk(Time, this.info.date);
|
||||||
},
|
},
|
||||||
createFunc: function(format) {
|
createFunc: function(format) {
|
||||||
var code;
|
var code;
|
||||||
code = format.replace(/%([A-Za-z])/g, function(s, c) {
|
code = format.replace(/%([A-Za-z])/g, function(s, c) {
|
||||||
if (c in Time.formatters) {
|
if (c in Time.formatters) {
|
||||||
return "' + this.formatters." + c + ".call(date) + '";
|
return "' + Time.formatters." + c + ".call(date) + '";
|
||||||
} else {
|
} else {
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return Function('date', "return '" + code + "'");
|
return Function('Time', 'date', "return '" + code + "'");
|
||||||
},
|
},
|
||||||
day: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
|
day: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
|
||||||
month: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
|
month: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
|
||||||
|
|||||||
@ -8,14 +8,14 @@ Time =
|
|||||||
cb: @node
|
cb: @node
|
||||||
node: ->
|
node: ->
|
||||||
return if @isClone
|
return if @isClone
|
||||||
@nodes.date.textContent = Time.funk @info.date
|
@nodes.date.textContent = Time.funk Time, @info.date
|
||||||
createFunc: (format) ->
|
createFunc: (format) ->
|
||||||
code = format.replace /%([A-Za-z])/g, (s, c) ->
|
code = format.replace /%([A-Za-z])/g, (s, c) ->
|
||||||
if c of Time.formatters
|
if c of Time.formatters
|
||||||
"' + this.formatters.#{c}.call(date) + '"
|
"' + Time.formatters.#{c}.call(date) + '"
|
||||||
else
|
else
|
||||||
s
|
s
|
||||||
Function 'date', "return '#{code}'"
|
Function 'Time', 'date', "return '#{code}'"
|
||||||
day: [
|
day: [
|
||||||
'Sunday'
|
'Sunday'
|
||||||
'Monday'
|
'Monday'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user