Allow double quotes in template strings fixes #2120
This commit is contained in:
parent
b0df9627b0
commit
a7f2d1975f
@ -194,25 +194,27 @@ describe('Util', function() {
|
||||
var str = L.Util.template(tpl, {
|
||||
foo: 'Vlad',
|
||||
bar: 'Dave',
|
||||
baz:function(o){
|
||||
baz: function (o) {
|
||||
return o.bar;
|
||||
}
|
||||
});
|
||||
|
||||
expect(str).to.eql('Hello Vlad and Dave!');
|
||||
});
|
||||
|
||||
it('check the cache', function () {
|
||||
var tpl = 'Hello {foo} and {baz }!';
|
||||
|
||||
var str = L.Util._templateCache[tpl]({
|
||||
foo: 'ladies',
|
||||
baz: function() {
|
||||
baz: function () {
|
||||
return 'gentlemen';
|
||||
}
|
||||
});
|
||||
|
||||
expect(str).to.eql('Hello ladies and gentlemen!');
|
||||
});
|
||||
|
||||
it('evaluates templates with a function', function () {
|
||||
var tpl = L.Util.compileTemplate('Hello { foo } and { bar}!',{});
|
||||
|
||||
@ -228,10 +230,17 @@ describe('Util', function() {
|
||||
expect(str1).to.eql('Hello Vlad and Dave!');
|
||||
expect(str2).to.eql('Hello {Calvin} and {Simon}!');
|
||||
});
|
||||
|
||||
it('does not modify text without a token variable', function () {
|
||||
expect(L.Util.template('foo', {})).to.eql('foo');
|
||||
});
|
||||
|
||||
it('supports templates with double quotes', function () {
|
||||
expect(L.Util.template('He said: "{foo}"!', {
|
||||
foo: 'Hello'
|
||||
})).to.eql('He said: "Hello"!');
|
||||
});
|
||||
|
||||
it('throws when a template token is not given', function () {
|
||||
expect(function () {
|
||||
L.Util.template(tpl, {foo: 'bar'});
|
||||
|
@ -107,6 +107,7 @@ L.Util = {
|
||||
|
||||
compileTemplate: function (str, data) {
|
||||
// based on https://gist.github.com/padolsey/6008842
|
||||
str = str.replace(/"/g, '\\\"');
|
||||
str = str.replace(/\{ *([\w_]+) *\}/g, function (str, key) {
|
||||
return '" + o["' + key + '"]' + (typeof data[key] === 'function' ? '(o)' : '') + ' + "';
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user