Skip to content

Commit 0f34814

Browse files
dolflydolfly
committed
Merge pull request #1 from angular/master
sync
2 parents 33ad2b4 + 876df04 commit 0f34814

File tree

870 files changed

+115557
-43917
lines changed

Some content is hidden

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

870 files changed

+115557
-43917
lines changed

‎.bowerrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"directory": "bower_components",
3+
"json": "bower.json"
4+
}

‎.externalToolBuilders/JSTD_Tests.launch

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.externalToolBuilders/JSTD_perf.launch

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.externalToolBuilders/docs.launch

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.externalToolBuilders/gen_docs.launch

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.externalToolBuilders/jsLint.launch

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.gitignore

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
build/
2-
angularjs.netrc
3-
jstd.log
1+
/build/
42
.DS_Store
53
gen_docs.disable
64
test.disable
75
regression/temp*.html
86
performance/temp*.html
97
.idea/workspace.xml
108
*~
9+
*.swp
1110
angular.js.tmproj
12-
node_modules
13-
jsTestDriver*.conf
11+
/node_modules/
12+
/components/
13+
/bower_components/
1414
angular.xcodeproj
1515
.idea
16+
.agignore
17+
libpeerconnection.log
18+
npm-debug.log
19+
/tmp/
20+
/scripts/bower/bower-*

‎.jscs.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"disallowKeywords": ["with"],
3+
"disallowTrailingWhitespace": true,
4+
"requireRightStickedOperators": ["!"],
5+
"requireLeftStickedOperators": [","]
6+
}

‎.jscs.json.todo

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// This is an incomplete TODO list of checks we want to start enforcing
2+
//
3+
// The goal is to enable these checks one by one by moving them to .jscs.json along with commits
4+
// that correct the existing code base issues and make the new check pass.
5+
6+
{
7+
"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
8+
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
9+
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
10+
"disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
11+
"disallowImplicitTypeConversion": ["string"],
12+
"disallowMultipleLineBreaks": true,
13+
"disallowKeywordsOnNewLine": ["else"],
14+
"requireLineFeedAtFileEnd": true,
15+
"validateJSDoc": {
16+
"checkParamNames": true,
17+
"requireParamTypes": true
18+
}
19+
}

‎.project

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy