aboutsummaryrefslogtreecommitdiffstats
path: root/src/Parser.js
diff options
context:
space:
mode:
authorAndres Ornelas2010-07-27 10:44:46 -0700
committerAndres Ornelas2010-07-27 10:44:46 -0700
commitb42072733c3afd03a49457d88ffed28ebe55655e (patch)
tree2fa2b8703cdc75fe19a204d2c9677e27d33c8176 /src/Parser.js
parent2f7c538628929888ce7c99b9577e34f8c87211f7 (diff)
parent8ddee9bb25ade2bbe7d57db6353b29867606c184 (diff)
downloadangular.js-b42072733c3afd03a49457d88ffed28ebe55655e.tar.bz2
Merge branch 'master' of github.com:angular/angular.js into future
Diffstat (limited to 'src/Parser.js')
-rw-r--r--src/Parser.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Parser.js b/src/Parser.js
index df270792..5c2307e4 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -602,6 +602,8 @@ Parser.prototype = {
var fnPtr = fn(self);
if (typeof fnPtr === 'function') {
return fnPtr.apply(self, args);
+ } else if (fnPtr === undefined) {
+ return fnPtr;
} else {
throw "Expression '" + fn.isAssignable + "' is not a function.";
}