Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 3bbf645

Browse files
author
Ricardo Bin
committed
Merge remote-tracking branch 'github/master' into jsonp_callback
Conflicts: src/ng/httpBackend.js
2 parents 80801fd + df3d739 commit 3bbf645

File tree

1,314 files changed

+185709
-56493
lines changed

Some content is hidden

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

1,314 files changed

+185709
-56493
lines changed

‎.editorconfig

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# http://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
indent_style = space
8+
indent_size = 2
9+
end_of_line = lf
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
[src/ngLocale/**]
14+
insert_final_newline = false
15+
16+
[dropdown-toggle.js]
17+
trim_trailing_whitespace = false
18+
insert_final_newline = false
19+
20+
[htmlparser.js]
21+
insert_final_newline = false

‎.gitignore

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
/build/
2+
/benchpress-build/
23
.DS_Store
34
gen_docs.disable
45
test.disable
56
regression/temp*.html
67
performance/temp*.html
78
.idea/workspace.xml
89
*~
10+
*.swp
911
angular.js.tmproj
1012
/node_modules/
11-
/components/
13+
bower_components/
1214
angular.xcodeproj
1315
.idea
16+
.agignore
17+
.lvimrc
18+
libpeerconnection.log
19+
npm-debug.log
20+
/tmp/
21+
/scripts/bower/bower-*

‎.jscs.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"disallowKeywords": ["with"],
3+
"disallowMixedSpacesAndTabs": true,
4+
"disallowMultipleLineStrings": true,
5+
"disallowNewlineBeforeBlockStatements": true,
6+
"disallowSpaceAfterObjectKeys": true,
7+
"disallowSpaceAfterPrefixUnaryOperators": ["!"],
8+
"disallowSpaceBeforeBinaryOperators": [","],
9+
"disallowSpacesInAnonymousFunctionExpression": {
10+
"beforeOpeningRoundBrace": true
11+
},
12+
"disallowSpacesInFunctionDeclaration": {
13+
"beforeOpeningRoundBrace": true
14+
},
15+
"disallowSpacesInNamedFunctionExpression": {
16+
"beforeOpeningRoundBrace": true
17+
},
18+
"disallowSpacesInsideParentheses": true,
19+
"disallowTrailingComma": true,
20+
"disallowTrailingWhitespace": true,
21+
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
22+
"requireSpacesInFunction": {
23+
"beforeOpeningCurlyBrace": true
24+
},
25+
"validateParameterSeparator": ", "
26+
}

‎.jscs.json.todo

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
"requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
9+
"requireSpaceBeforeBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
10+
"disallowImplicitTypeConversion": ["string"],
11+
"disallowMultipleLineBreaks": true,
12+
"disallowKeywordsOnNewLine": ["else"],
13+
"requireLineFeedAtFileEnd": true,
14+
"validateJSDoc": {
15+
"checkParamNames": true,
16+
"requireParamTypes": true
17+
}
18+
}

‎.jshintignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules/**
2+
lib/htmlparser/**

‎.jshintrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"extends": ".jshintrc-base",
3+
"node": true,
4+
"globals": {}
5+
}

‎.jshintrc-base

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"bitwise": true,
3+
"immed": true,
4+
"newcap": true,
5+
"noarg": true,
6+
"noempty": true,
7+
"nonew": true,
8+
"trailing": true,
9+
"maxlen": 200,
10+
"boss": true,
11+
"eqnull": true,
12+
"expr": true,
13+
"globalstrict": true,
14+
"laxbreak": true,
15+
"loopfunc": true,
16+
"sub": true,
17+
"undef": true,
18+
"indent": 2
19+
}

‎.travis.yml

+40-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,48 @@
11
language: node_js
22
node_js:
3-
- 0.8
3+
- '0.10'
4+
5+
branches:
6+
except:
7+
- /^g3_.*$/
8+
9+
env:
10+
matrix:
11+
- JOB=unit
12+
- JOB=e2e TEST_TARGET=jqlite
13+
- JOB=e2e TEST_TARGET=jquery
14+
global:
15+
- SAUCE_USERNAME=angular-ci
16+
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
17+
- LOGS_DIR=/tmp/angular-build/logs
18+
- BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
19+
20+
install:
21+
# - npm config set registry http://23.251.144.68
22+
# Disable the spinner, it looks bad on Travis
23+
- npm config set spin false
24+
# Log HTTP requests
25+
- npm config set loglevel http
26+
- time ./scripts/travis/npm-bundle-deps.sh
27+
- time npm install
428

529
before_script:
6-
- export DISPLAY=:99.0
7-
- sh -e /etc/init.d/xvfb start
30+
- mkdir -p $LOGS_DIR
31+
- ./lib/sauce/sauce_connect_setup.sh
832
- npm install -g grunt-cli
933
- grunt package
10-
- grunt webserver > /dev/null &
34+
- ./scripts/travis/wait_for_browser_provider.sh
1135

1236
script:
13-
- grunt test --browsers Firefox --reporters=dots
37+
- ./scripts/travis/build.sh
38+
39+
after_script:
40+
- ./scripts/travis/print_logs.sh
41+
42+
notifications:
43+
webhooks:
44+
urls:
45+
- https://webhooks.gitter.im/e/d2120f3f2bb39a4531b2
46+
on_success: change # options: [always|never|change] default: always
47+
on_failure: always # options: [always|never|change] default: always
48+
on_start: false # default: false

0 commit comments

Comments
 (0)