aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2012-01-24 02:40:25 -0800
committerIgor Minar2012-01-25 16:17:44 -0800
commit18a1e860a3d50b04d7c0836ba7c6c0a0b96335be (patch)
treef99d0b5bd3c84e51ad747c31e2f3c77c907724c0
parent39b3297fc34b6b15bb3487f619ad1e93c4480741 (diff)
downloadangular.js-18a1e860a3d50b04d7c0836ba7c6c0a0b96335be.tar.bz2
fix($parse): small fixes
- typos - dead code removal - remove unneeded variable
-rw-r--r--src/service/parse.js21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/service/parse.js b/src/service/parse.js
index c4a1258a..f33aad0d 100644
--- a/src/service/parse.js
+++ b/src/service/parse.js
@@ -4,7 +4,7 @@ var OPERATORS = {
'null':function(self){return null;},
'true':function(self){return true;},
'false':function(self){return false;},
- $undefined:noop,
+ undefined:noop,
'+':function(self, a,b){a=a(self); b=b(self); return (isDefined(a)?a:0)+(isDefined(b)?b:0);},
'-':function(self, a,b){a=a(self); b=b(self); return (isDefined(a)?a:0)-(isDefined(b)?b:0);},
'*':function(self, a,b){return a(self)*b(self);},
@@ -511,9 +511,8 @@ function parser(text, json, $filter){
function primary() {
var primary;
if (expect('(')) {
- var expression = filterChain();
+ primary = filterChain();
consume(')');
- primary = expression;
} else if (expect('[')) {
primary = arrayDeclaration();
} else if (expect('{')) {
@@ -646,22 +645,6 @@ function parser(text, json, $filter){
return object;
};
}
-
- function watchDecl () {
- var anchorName = expect().text;
- consume(":");
- var expressionFn;
- if (peekToken().text == '{') {
- consume("{");
- expressionFn = statements();
- consume("}");
- } else {
- expressionFn = expression();
- }
- return function(self) {
- return {name:anchorName, fn:expressionFn};
- };
- }
}
//////////////////////////////////////////////////