diff options
| author | petrovalex | 2012-05-25 23:58:34 +0300 |
|---|---|---|
| committer | Misko Hevery | 2012-09-06 16:06:21 -0700 |
| commit | 42c38b29f7dcb3327fe58e630b8e2973676989e0 (patch) | |
| tree | c74fcef44a425ca188be3c9a2fb4b8b33da34b81 /src/ng/parse.js | |
| parent | f299fd512248321b426a5ab924a329aa1b691280 (diff) | |
| download | angular.js-42c38b29f7dcb3327fe58e630b8e2973676989e0.tar.bz2 | |
fix($parser): string concatination with undefined model
Closes #988
Diffstat (limited to 'src/ng/parse.js')
| -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);}, |
