cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up template interpolation code #1969

Browse Source
This commit is contained in:
Vladimir Agafonkin 2013-08-27 21:45:13 +03:00
parent 1581a94fc3
commit d0f768ba36
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/Util.js
View File

@ -104,33 +104,20 @@ L.Util = {
} }
return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&'); return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');
}, },
compileTemplate: function (str, data) { compileTemplate: function (str, data) {
/*jslint evil: true */ // based on https://gist.github.com/padolsey/6008842
//from https://gist.github.com/padolsey/6008842 str = str.replace(/\{ *([\w_]+) *\}/g, function (str, key) {
return new Function( return '" + o["' + key + '"]' + (typeof data[key] === 'function' ? '(o)' : '') + ' + "';
'o', });
'return "' + ( // jshint evil: true
str.replace(/\"/g, '\\"').replace(/\{ *([\w_]+) *\}/g, function (_, $1) { return new Function('o', 'return "' + str + '";');
if (typeof data[$1] === 'function') {
return '" + o["' + $1 + '"](o) + "';
} else {
return '" + o["' + $1 + '"] + "';
}
})
) + '";'
);
}, },
templateCache: {},
template: function (str, data) { template: function (str, data) {
if (str in this.templateCache) { var cache = L.Util._templateCache = L.Util._templateCache || {};
return this.templateCache[str](data); cache[str] = cache[str] || L.Util.compileTemplate(str, data);
} else { return cache[str](data);
this.templateCache[str] = this.compileTemplate(str, data);
return this.templateCache[str](data);
}
}, },
isArray: function (obj) { isArray: function (obj) {