diff options
| author | Misko Hevery | 2011-02-12 08:58:11 -0800 |
|---|---|---|
| committer | Misko Hevery | 2011-02-16 08:59:57 -0500 |
| commit | cdc093a463e8f8a925cbb9f2b55bedf0a1d8e7e8 (patch) | |
| tree | c481c1b86986f156646eafc9d0ec4db852edb455 /src/parser.js | |
| parent | 00cc9eb32a9387040d0175fcfd21cf9dcab6514f (diff) | |
| download | angular.js-cdc093a463e8f8a925cbb9f2b55bedf0a1d8e7e8.tar.bz2 | |
reformated multiline trinary expressions to have a leading ?/:.
Diffstat (limited to 'src/parser.js')
| -rw-r--r-- | src/parser.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/parser.js b/src/parser.js index f2ca7a80..a8bd21e4 100644 --- a/src/parser.js +++ b/src/parser.js @@ -107,9 +107,9 @@ function lex(text, parseStringsForObjects){ function throwError(error, start, end) { end = end || index; throw Error("Lexer Error: " + error + " at column" + - (isDefined(start) ? - "s " + start + "-" + index + " [" + text.substring(start, end) + "]" : - " " + end) + + (isDefined(start) + ? "s " + start + "-" + index + " [" + text.substring(start, end) + "]" + : " " + end) + " in expression [" + text + "]."); } @@ -199,8 +199,9 @@ function lex(text, parseStringsForObjects){ index++; tokens.push({index:start, text:rawString, string:string, json:true, fn:function(){ - return (string.length == dateParseLength) ? - angular['String']['toDate'](string) : string; + return (string.length == dateParseLength) + ? angular['String']['toDate'](string) + : string; }}); return; } else { @@ -588,9 +589,9 @@ function parser(text, json){ } var fnPtr = fn(self) || noop; // IE stupidity! - return fnPtr.apply ? - fnPtr.apply(self, args) : - fnPtr(args[0], args[1], args[2], args[3], args[4]); + return fnPtr.apply + ? fnPtr.apply(self, args) + : fnPtr(args[0], args[1], args[2], args[3], args[4]); }; } |
