JuanCanham/HackMyResume
1
0
Fork 0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2024-11-22 08:20:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #14 from fluentdesk/ver/0.8.0

Browse Source 
ver/0.7.2
This commit is contained in:
JD 2015-10-27 21:37:35 -04:00
commit b4907dc1b9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -24,7 +24,7 @@
}, },
"homepage": "https://github.com/fluentdesk/fluentcv", "homepage": "https://github.com/fluentdesk/fluentcv",
"dependencies": { "dependencies": {
"fluent-themes": "0.1.0-beta", "fluent-themes": "0.2.0-beta",
"fs-extra": "^0.24.0", "fs-extra": "^0.24.0",
"html": "0.0.10", "html": "0.0.10",
"is-my-json-valid": "^2.12.2", "is-my-json-valid": "^2.12.2",

4
src/core/fluent-date.js
View File

@ -28,7 +28,7 @@ function FluentDate( dt ) {
FluentDate/*.prototype*/.fmt = function( dt ) { FluentDate/*.prototype*/.fmt = function( dt ) {
if( (typeof dt === 'string' || dt instanceof String) ) { if( (typeof dt === 'string' || dt instanceof String) ) {
dt = dt.toLowerCase().trim(); dt = dt.toLowerCase().trim();
if( /^(present|now)$/.test(dt) ) { // "Present", "Now" if( /^(present|now|current)$/.test(dt) ) { // "Present", "Now"
return moment(); return moment();
} }
else if( /^\D+\s+\d{4}$/.test(dt) ) { // "Mar 2015" else if( /^\D+\s+\d{4}$/.test(dt) ) { // "Mar 2015"
@ -40,7 +40,7 @@ FluentDate/*.prototype*/.fmt = function( dt ) {
else if( /^\d{4}-\d{1,2}$/.test(dt) ) { // "2015-03", "1998-4" else if( /^\d{4}-\d{1,2}$/.test(dt) ) { // "2015-03", "1998-4"
return moment( dt, 'YYYY-MM' ); return moment( dt, 'YYYY-MM' );
} }
else if( /^\s\d{4}$/.test(dt) ) { // "2015" else if( /^\s*\d{4}\s*$/.test(dt) ) { // "2015"
return moment( dt, 'YYYY' ); return moment( dt, 'YYYY' );
} }
else if( /^\s*$/.test(dt) ) { // "", " " else if( /^\s*$/.test(dt) ) { // "", " "

2
src/gen/template-generator.js
View File

@ -35,7 +35,7 @@ var _defaultOpts = {
}, },
prettify: { // ← See https://github.com/beautify-web/js-beautify#options prettify: { // ← See https://github.com/beautify-web/js-beautify#options
indent_size: 2, indent_size: 2,
unformatted: ['em','strong'], unformatted: ['em','strong','a'],
max_char: 80, // ← See lib/html.js in above-linked repo max_char: 80, // ← See lib/html.js in above-linked repo
//wrap_line_length: 120, <-- Don't use this //wrap_line_length: 120, <-- Don't use this
} }