mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-05-15 02:03:11 +00:00
style(*): fix up semicolon and var usage
Conflicts: src/ng/animation.js src/ng/animator.js src/ng/http.js
This commit is contained in:
parent
4d8b0282b4
commit
ae33e11694
3 changed files with 8 additions and 9 deletions
2
src/angular-bootstrap.js
vendored
2
src/angular-bootstrap.js
vendored
|
|
@ -222,6 +222,6 @@
|
||||||
function isActuallyNaN(val) {
|
function isActuallyNaN(val) {
|
||||||
return (typeof val === 'number') && isNaN(val);
|
return (typeof val === 'number') && isNaN(val);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
})(window, document);
|
})(window, document);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -822,7 +822,7 @@ function $CompileProvider($provide) {
|
||||||
parentGet = $parse(attrs[attrName]);
|
parentGet = $parse(attrs[attrName]);
|
||||||
scope[scopeName] = function(locals) {
|
scope[scopeName] = function(locals) {
|
||||||
return parentGet(parentScope, locals);
|
return parentGet(parentScope, locals);
|
||||||
}
|
};
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -154,10 +154,10 @@ function lex(text, csp){
|
||||||
function readIdent() {
|
function readIdent() {
|
||||||
var ident = "",
|
var ident = "",
|
||||||
start = index,
|
start = index,
|
||||||
lastDot, peekIndex, methodName;
|
lastDot, peekIndex, methodName, ch;
|
||||||
|
|
||||||
while (index < text.length) {
|
while (index < text.length) {
|
||||||
var ch = text.charAt(index);
|
ch = text.charAt(index);
|
||||||
if (ch == '.' || isIdent(ch) || isNumber(ch)) {
|
if (ch == '.' || isIdent(ch) || isNumber(ch)) {
|
||||||
if (ch == '.') lastDot = index;
|
if (ch == '.') lastDot = index;
|
||||||
ident += ch;
|
ident += ch;
|
||||||
|
|
@ -171,7 +171,7 @@ function lex(text, csp){
|
||||||
if (lastDot) {
|
if (lastDot) {
|
||||||
peekIndex = index;
|
peekIndex = index;
|
||||||
while(peekIndex < text.length) {
|
while(peekIndex < text.length) {
|
||||||
var ch = text.charAt(peekIndex);
|
ch = text.charAt(peekIndex);
|
||||||
if (ch == '(') {
|
if (ch == '(') {
|
||||||
methodName = ident.substr(lastDot - start + 1);
|
methodName = ident.substr(lastDot - start + 1);
|
||||||
ident = ident.substr(0, lastDot - start);
|
ident = ident.substr(0, lastDot - start);
|
||||||
|
|
@ -637,8 +637,7 @@ function parser(text, json, $filter, csp){
|
||||||
var object = {};
|
var object = {};
|
||||||
for ( var i = 0; i < keyValues.length; i++) {
|
for ( var i = 0; i < keyValues.length; i++) {
|
||||||
var keyValue = keyValues[i];
|
var keyValue = keyValues[i];
|
||||||
var value = keyValue.value(self, locals);
|
object[keyValue.key] = keyValue.value(self, locals);
|
||||||
object[keyValue.key] = value;
|
|
||||||
}
|
}
|
||||||
return object;
|
return object;
|
||||||
};
|
};
|
||||||
|
|
@ -760,7 +759,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
|
||||||
}
|
}
|
||||||
return pathVal;
|
return pathVal;
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
|
|
||||||
function getterFn(path, csp) {
|
function getterFn(path, csp) {
|
||||||
if (getterFnCache.hasOwnProperty(path)) {
|
if (getterFnCache.hasOwnProperty(path)) {
|
||||||
|
|
@ -775,7 +774,7 @@ function getterFn(path, csp) {
|
||||||
fn = (pathKeysLength < 6)
|
fn = (pathKeysLength < 6)
|
||||||
? cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4])
|
? cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4])
|
||||||
: function(scope, locals) {
|
: function(scope, locals) {
|
||||||
var i = 0, val
|
var i = 0, val;
|
||||||
do {
|
do {
|
||||||
val = cspSafeGetterFn(
|
val = cspSafeGetterFn(
|
||||||
pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++]
|
pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue