Skip to content

Simplify/Improve template function #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify/Improve template function #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions lib/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,16 +386,9 @@ string.js - Copyright (C) 2012-2014, JP Richardson <[email protected]>
var opening = opening || Export.TMPL_OPEN
var closing = closing || Export.TMPL_CLOSE

var open = opening.replace(/[-[\]()*\s]/g, "\\$&").replace(/\$/g, '\\$')
var close = closing.replace(/[-[\]()*\s]/g, "\\$&").replace(/\$/g, '\\$')
var r = new RegExp(open + '(.+?)' + close, 'g')
//, r = /\{\{(.+?)\}\}/g
var matches = s.match(r) || [];

matches.forEach(function(match) {
var key = match.substring(opening.length, match.length - closing.length);//chop {{ and }}
if (typeof values[key] != 'undefined')
s = s.replace(match, values[key]);
var re = new RegExp(opening.replace(/([^a-z])/gi,'\\$1')+'(.*?)'+closing.replace(/([^a-z])/gi,'\\$1'), 'g');
s = s.replace(re, function(all,key) {
return values[key]!==undefined ? values[key] : all
});
return new this.constructor(s);
},
Expand Down