Skip to content

Commit 6998fc9

Browse files
starwedstarwed
committed
Merge branch 'testing' into release
Release version 0.8.0
2 parents 3ab90bc + f0227ed commit 6998fc9

File tree

144 files changed

+23677
-8986
lines changed

Some content is hidden

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

144 files changed

+23677
-8986
lines changed

‎.editorconfig

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
### http://EditorConfig.org
2+
3+
root = true
4+
5+
[**]
6+
charset = utf-8
7+
indent_size = 2
8+
indent_style = space
9+
trim_trailing_whitespace = true
10+
### Don't force LF on Win platforms, change to native once available
11+
# end_of_line = lf
12+
insert_final_newline = true
13+
14+
15+
[Gruntfile.js]
16+
indent_size = 4
17+
18+
[src/**]
19+
indent_size = 4
20+
21+
[tests/lib/mockTouchEvents.js]
22+
indent_size = 4
23+
24+
[tests/webdriver/index*.js]
25+
indent_size = 4
26+
27+
[build/**.coffee]
28+
indent_size = 4

‎.gitattributes

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Let git detect text files that are not listed below and let it normalize them
2+
# - convert line endings from LF to CRLF on checkout in Windows
3+
# - convert line endings from CRLF to LF on commit in Windows
4+
# - don't touch line endings in Linux / Mac
5+
6+
* text=auto
7+
8+
9+
# Explicitly tell git which text files will be normalized
10+
11+
# web languages
12+
*.js text
13+
*.jsx text
14+
*.json text
15+
*.coffee text
16+
*.html text
17+
*.css text
18+
19+
# config files
20+
*.gitignore text
21+
*.gitattributes text
22+
*.yml text
23+
*.editorconfig text
24+
*.npmignore text
25+
*.jshintrc text
26+
*.jshintignore text
27+
28+
# misc
29+
*.md text
30+
*.sh text
31+
*.frag text
32+
*.vert text
33+
34+
35+
# Explicitly tell git which binary files won't be normalized
36+
37+
*.png binary
38+
*.jpg binary
39+
*.jpeg binary
40+
*.wav binary

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ build/api.json
44
build/parseNodes.js
55
build/parseSourceDocs.js
66
build/api-gen.js
7+
build/webdriver/*
8+
!build/webdriver/README.md
9+
!build/webdriver/failed
10+
build/webdriver/failed/*
11+
!build/webdriver/failed/README.md
712
.*.sw?
813
.DS_store
914
.project

‎.jshintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests/lib/**

‎.jshintrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"eqeqeq": true,
3+
"esversion": 5,
4+
"freeze": true,
5+
"futurehostile": true,
6+
"latedef": "nofunc",
7+
"noarg": true,
8+
"nonbsp": true,
9+
"nonew": true,
10+
"strict": "implied",
11+
"undef": true,
12+
"unused": "vars",
13+
"validthis": true,
14+
"browser": true,
15+
"node": true
16+
}

‎.npmignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
**
2+
!package.json
3+
!README.md
4+
!CHANGELOG.md
5+
!dist
6+
!dist/crafty.js
7+
!dist/crafty-min.js
8+
!src
9+
!src/**

‎.travis.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
1+
sudo: false
2+
13
language: node_js
24
node_js:
3-
- '0.10'
4-
before_script:
5-
- npm install -g grunt-cli
6-
7-
after_success: ./travis-nightly.sh
8-
5+
- '6'
96
cache:
107
directories:
11-
- node_modules
8+
- node_modules
9+
10+
before_install: if [ "$TRAVIS_BRANCH" != $SAUCE_BRANCH ]; then unset SAUCE_USERNAME && unset SAUCE_ACCESS_KEY; fi
11+
before_script: npm install -g grunt-cli
12+
after_success: "./travis-nightly.sh"
13+
after_failure: if [ "$GH_TOKEN" ]; then grunt gh-pages:crafty-distro-regression-tests; fi
14+
1215
env:
1316
global:
14-
secure: p6SeAGd+Gohr6XeDkb5JPSQBu88UxAjljSMK0BNLJQgr8GkoA3mSJWy4uX0YjNq93VX4UMFxr0D4MlkcWZpX+cdN8K9PpxOgTq8Ml1Ljs355zbX9U/CdY99okiwzHktY4qKXBPsHLiEuCBeJ6pxs/v7m9z88mkjwDSunJG7F1oo=
17+
- SAUCE_BRANCH=testing
18+
# GitHub token
19+
- secure: p6SeAGd+Gohr6XeDkb5JPSQBu88UxAjljSMK0BNLJQgr8GkoA3mSJWy4uX0YjNq93VX4UMFxr0D4MlkcWZpX+cdN8K9PpxOgTq8Ml1Ljs355zbX9U/CdY99okiwzHktY4qKXBPsHLiEuCBeJ6pxs/v7m9z88mkjwDSunJG7F1oo=
20+
# OpenSauce credentials: for pre-relase testing
21+
- secure: NO+7PK5P0XLGbnvdSDBlrlnzqM/hMTy3wxxAp8ZtzEuS2ZOXn8q0KjOO/cAs1NorG1SOl8+XfFZBTR5W504GrHYLP8fNkLJOAyKMfFeTojwQ+385ShVr/NejZFejsc+xJZymIeDsEzBZqosxPOi+8k7jljDK4mzLdKMpt8flWUw=
22+
- secure: iGO+VCkCq/26Dqrc6+G1nX8Dk+tTqhcINuiIVhxGtMARcY+WIzcyEK/cfXRaLnvIzIxQ0xUoGGnM9xe4DQT8L+BGzo8AGnVbzxITzceWTlhsFepcbOTgqOg0ZGMxQVQ6VBh888Cdks8KsOgtTNhzd+oVgcStsyxZPCVD/7VgNTE=
23+
24+
addons:
25+
sauce_connect:
26+
no_ssl_bump_domains: all

‎.vscode/tasks.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "0.1.0",
5+
"command": "grunt",
6+
"isShellCommand": true,
7+
"tasks": [
8+
{
9+
"taskName": "build:release",
10+
"args": [],
11+
"isBuildCommand": true,
12+
"isWatching": false,
13+
"problemMatcher": [
14+
"$lessCompile",
15+
"$tsc",
16+
"$jshint"
17+
]
18+
},
19+
{
20+
"taskName": "test",
21+
"args": [],
22+
"isTestCommand": true
23+
}
24+
]
25+
}

0 commit comments

Comments
 (0)