kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-23 03:30:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where $eval on undefined throws error

Browse Source
This commit is contained in:
Misko Hevery
2010-08-10 11:23:23 -07:00
parent 4aac29da18
commit 9b392eca35
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Scope.js
View File

@@ -130,7 +130,8 @@ function createScope(parent, services, existing) {
$set: bind(instance, setter, instance),
$eval: function $eval(exp) {
if (exp === undefined) {
var type = typeof exp;
if (type == 'undefined') {
for ( var i = 0, iSize = evalLists.sorted.length; i < iSize; i++) {
for ( var queue = evalLists.sorted[i],
jSize = queue.length,
@@ -138,18 +139,19 @@ function createScope(parent, services, existing) {
instance.$tryEval(queue[j].fn, queue[j].handler);
}
}
} else if (typeof exp === 'function'){
} else if (type === 'function') {
return exp.call(instance);
} else {
} else if (type === 'string') {
return expressionCompile(exp).call(instance);
}
},
$tryEval: function (expression, exceptionHandler) {
var type = typeof expression;
try {
if (typeof expression == 'function') {
if (type == 'function') {
return expression.call(instance);
} else {
} else if (type == 'string'){
return expressionCompile(expression).call(instance);
}
} catch (e) {