Skip to content

Commit 030101a

Browse files
hzoocaitp
hzoo
authored and
caitp
committed
style(*): add numerous JSCS rules to unify code-styles in the tree
Changes: - add rule requireSpaceBeforeBlockStatements (require space before brace when opening block statement) - add operators to rule disallowSpaceAfterPrefixUnaryOperators (no space after prefix inc/dec ops) - add rule disallowSpaceBeforePostfixUnaryOperators (no space before postfix inc/dec ops) - add rule disallowSpacesInsideArrayBrackets (array literals no longer padded with spaces) - add rule requireCommaBeforeLineBreak (line can't start with comma token) - add rule validateLineBreaks (require LF linebreaks) Closes angular#9792
1 parent 2a0254e commit 030101a

736 files changed

Lines changed: 757 additions & 752 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.jscs.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
"disallowMultipleLineStrings": true,
55
"disallowNewlineBeforeBlockStatements": true,
66
"disallowSpaceAfterObjectKeys": true,
7-
"disallowSpaceAfterPrefixUnaryOperators": ["!"],
7+
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
88
"disallowSpaceBeforeBinaryOperators": [","],
9+
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
910
"disallowSpacesInAnonymousFunctionExpression": {
1011
"beforeOpeningRoundBrace": true
1112
},
@@ -15,12 +16,17 @@
1516
"disallowSpacesInNamedFunctionExpression": {
1617
"beforeOpeningRoundBrace": true
1718
},
19+
"disallowSpacesInsideArrayBrackets": true,
1820
"disallowSpacesInsideParentheses": true,
1921
"disallowTrailingComma": true,
2022
"disallowTrailingWhitespace": true,
23+
"requireCommaBeforeLineBreak": true,
24+
"requireLineFeedAtFileEnd": true,
2125
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
26+
"requireSpaceBeforeBlockStatements": true,
2227
"requireSpacesInFunction": {
2328
"beforeOpeningCurlyBrace": true
2429
},
30+
"validateLineBreaks": "LF",
2531
"validateParameterSeparator": ", "
2632
}

‎.jscs.json.todo‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"disallowImplicitTypeConversion": ["string"],
1111
"disallowMultipleLineBreaks": true,
1212
"disallowKeywordsOnNewLine": ["else"],
13-
"requireLineFeedAtFileEnd": true,
1413
"validateJSDoc": {
1514
"checkParamNames": true,
1615
"requireParamTypes": true

‎i18n/src/closureI18nExtractor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function outputLocale(localeInfo, localeID) {
224224
getDecimals + getVF + getWT +
225225
'$provide.value("$locale", ';
226226

227-
var suffix = ');\n}]);';
227+
var suffix = ');\n}]);\n';
228228

229229
return prefix + content + suffix;
230230
}

‎src/jqLite.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ var JQLitePrototype = JQLite.prototype = {
481481
}
482482

483483
// check if document is already loaded
484-
if (document.readyState === 'complete'){
484+
if (document.readyState === 'complete') {
485485
setTimeout(trigger);
486486
} else {
487487
this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
@@ -802,7 +802,7 @@ forEach({
802802
var target = this, related = event.relatedTarget;
803803
// For mousenter/leave call the handler if related is outside the target.
804804
// NB: No relatedTarget if the mouse left/entered the browser window
805-
if (!related || (related !== target && !target.contains(related))){
805+
if (!related || (related !== target && !target.contains(related))) {
806806
handle(event, type);
807807
}
808808
});

‎src/ng/http.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ function $HttpProvider() {
10921092

10931093
forEach(value, function(v) {
10941094
if (isObject(v)) {
1095-
if (isDate(v)){
1095+
if (isDate(v)) {
10961096
v = v.toISOString();
10971097
} else {
10981098
v = toJson(v);

‎src/ngCookies/cookies.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ angular.module('ngCookies', ['ng']).
103103
}
104104

105105
//verify what was actually stored
106-
if (updated){
106+
if (updated) {
107107
updated = false;
108108
browserCookies = $browser.cookies();
109109

‎src/ngLocale/angular-locale_aa-dj.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ $provide.value("$locale", {
112112
"id": "aa-dj",
113113
"pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n, opt_precision); if (i == 1 && vf.v == 0) { return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
114114
});
115-
}]);
115+
}]);

‎src/ngLocale/angular-locale_aa-er.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ $provide.value("$locale", {
112112
"id": "aa-er",
113113
"pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n, opt_precision); if (i == 1 && vf.v == 0) { return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
114114
});
115-
}]);
115+
}]);

‎src/ngLocale/angular-locale_aa-et.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ $provide.value("$locale", {
112112
"id": "aa-et",
113113
"pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n, opt_precision); if (i == 1 && vf.v == 0) { return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
114114
});
115-
}]);
115+
}]);

‎src/ngLocale/angular-locale_aa.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ $provide.value("$locale", {
112112
"id": "aa",
113113
"pluralCat": function(n, opt_precision) { var i = n | 0; var vf = getVF(n, opt_precision); if (i == 1 && vf.v == 0) { return PLURAL_CATEGORY.ONE; } return PLURAL_CATEGORY.OTHER;}
114114
});
115-
}]);
115+
}]);

0 commit comments

Comments
 (0)