Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-19 12:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use new Function instead of eval()

Browse source 
Close #52
This commit is contained in:
Misko Hevery 2010-10-14 21:01:25 -07:00
parent a7da160c1d
commit 7903f4d940
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Scope.js
View file

@ -60,28 +60,25 @@ function getterFn(path){
var fn = getterFnCache[path]; var fn = getterFnCache[path];
if (fn) return fn; if (fn) return fn;
var code = 'function (s){\n'; var code = 'var l, fn, t;\n';
code += ' var l, fn, t;\n';
foreach(path.split('.'), function(key) { foreach(path.split('.'), function(key) {
key = (JS_KEYWORDS[key]) ? '["' + key + '"]' : '.' + key; key = (JS_KEYWORDS[key]) ? '["' + key + '"]' : '.' + key;
code += ' if(!s) return s;\n'; code += 'if(!s) return s;\n' +
code += ' l = s;\n'; 'l=s;\n' +
code += ' s = s' + key + ';\n'; 's=s' + key + ';\n' +
code += ' if(typeof s == "'+$function+'") \n'; 'if(typeof s=="function") s = function(){ return l'+key+'.apply(l, arguments); };\n';
code += ' s = function(){ return l'+key+'.apply(l, arguments); };\n';
if (key.charAt(1) == '$') { if (key.charAt(1) == '$') {
// special code for super-imposed functions // special code for super-imposed functions
var name = key.substr(2); var name = key.substr(2);
code += ' if(!s) {\n'; code += 'if(!s) {\n' +
code += ' t = angular.Global.typeOf(l);\n'; ' t = angular.Global.typeOf(l);\n' +
code += ' fn = (angular[t.charAt(0).toUpperCase() + t.substring(1)]||{})["' + name + '"];\n'; ' fn = (angular[t.charAt(0).toUpperCase() + t.substring(1)]||{})["' + name + '"];\n' +
code += ' if (fn)\n'; ' if (fn) s = function(){ return fn.apply(l, [l].concat(Array.prototype.slice.call(arguments, 0, arguments.length))); };\n' +
code += ' s = function(){ return fn.apply(l, [l].concat(Array.prototype.slice.call(arguments, 0, arguments.length))); };\n'; '}\n';
code += ' }\n';
} }
}); });
code += ' return s;\n}'; code += 'return s;';
fn = eval('fn = ' + code); fn = Function('s', code);
fn["toString"] = function(){ return code; }; fn["toString"] = function(){ return code; };
return getterFnCache[path] = fn; return getterFnCache[path] = fn;