aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Shikolay2013-05-07 00:56:51 -0400
committerIgor Minar2013-05-21 14:41:22 -0700
commitae33e11694fa6f47a1ea0dcb1f8ee6816d0e8556 (patch)
tree16055d1e55348b81b8381f823e65b3d21ff10e2f
parent4d8b0282b4e1d2de7948d3195f68c20b3c3765c2 (diff)
downloadangular.js-ae33e11694fa6f47a1ea0dcb1f8ee6816d0e8556.tar.bz2
style(*): fix up semicolon and var usage
Conflicts: src/ng/animation.js src/ng/animator.js src/ng/http.js
-rw-r--r--src/angular-bootstrap.js2
-rw-r--r--src/ng/compile.js2
-rw-r--r--src/ng/parse.js13
3 files changed, 8 insertions, 9 deletions
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 86b95814..b55bd475 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -222,6 +222,6 @@
function isActuallyNaN(val) {
return (typeof val === 'number') && isNaN(val);
}
- };
+ }
})(window, document);
diff --git a/src/ng/compile.js b/src/ng/compile.js
index 371617fe..a609d615 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -822,7 +822,7 @@ function $CompileProvider($provide) {
parentGet = $parse(attrs[attrName]);
scope[scopeName] = function(locals) {
return parentGet(parentScope, locals);
- }
+ };
break;
}
diff --git a/src/ng/parse.js b/src/ng/parse.js
index b85350a6..86ac8806 100644
--- a/src/ng/parse.js
+++ b/src/ng/parse.js
@@ -154,10 +154,10 @@ function lex(text, csp){
function readIdent() {
var ident = "",
start = index,
- lastDot, peekIndex, methodName;
+ lastDot, peekIndex, methodName, ch;
while (index < text.length) {
- var ch = text.charAt(index);
+ ch = text.charAt(index);
if (ch == '.' || isIdent(ch) || isNumber(ch)) {
if (ch == '.') lastDot = index;
ident += ch;
@@ -171,7 +171,7 @@ function lex(text, csp){
if (lastDot) {
peekIndex = index;
while(peekIndex < text.length) {
- var ch = text.charAt(peekIndex);
+ ch = text.charAt(peekIndex);
if (ch == '(') {
methodName = ident.substr(lastDot - start + 1);
ident = ident.substr(0, lastDot - start);
@@ -637,8 +637,7 @@ function parser(text, json, $filter, csp){
var object = {};
for ( var i = 0; i < keyValues.length; i++) {
var keyValue = keyValues[i];
- var value = keyValue.value(self, locals);
- object[keyValue.key] = value;
+ object[keyValue.key] = keyValue.value(self, locals);
}
return object;
};
@@ -760,7 +759,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
}
return pathVal;
};
-};
+}
function getterFn(path, csp) {
if (getterFnCache.hasOwnProperty(path)) {
@@ -775,7 +774,7 @@ function getterFn(path, csp) {
fn = (pathKeysLength < 6)
? cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4])
: function(scope, locals) {
- var i = 0, val
+ var i = 0, val;
do {
val = cspSafeGetterFn(
pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++]