diff options
| author | petrovalex | 2012-05-25 23:58:34 +0300 |
|---|---|---|
| committer | Misko Hevery | 2012-09-06 15:49:48 -0700 |
| commit | 0d52ff0f10157aa7d93a77abc78f6a6a6c3f6e45 (patch) | |
| tree | 6b4a57e85c60420816e0cdc0094c0ca309411a96 /src | |
| parent | baf52e902d92cee39d2e2060a49d9e740da7f0ec (diff) | |
| download | angular.js-0d52ff0f10157aa7d93a77abc78f6a6a6c3f6e45.tar.bz2 | |
fix($parser): string concatination with undefined model
Closes #988
Diffstat (limited to 'src')
| -rw-r--r-- | src/ng/parse.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ng/parse.js b/src/ng/parse.js index be17e6ca..97aba113 100644 --- a/src/ng/parse.js +++ b/src/ng/parse.js @@ -5,7 +5,15 @@ var OPERATORS = { 'true':function(){return true;}, 'false':function(){return false;}, undefined:noop, - '+':function(self, locals, a,b){a=a(self, locals); b=b(self, locals); return (isDefined(a)?a:0)+(isDefined(b)?b:0);}, + '+':function(self, locals, a,b){ + a=a(self, locals); b=b(self, locals); + if (isDefined(a)) { + if (isDefined(b)) { + return a + b; + } + return a; + } + return isDefined(b)?b:undefined;}, '-':function(self, locals, a,b){a=a(self, locals); b=b(self, locals); return (isDefined(a)?a:0)-(isDefined(b)?b:0);}, '*':function(self, locals, a,b){return a(self, locals)*b(self, locals);}, '/':function(self, locals, a,b){return a(self, locals)/b(self, locals);}, |
