Skip to content

Commit

Permalink
Merge pull request #2 from appsforartists/style-doc-correction
Browse files Browse the repository at this point in the history
Style doc correction
  • Loading branch information
appsforartists committed Mar 23, 2015
2 parents c892d2c + 6dca10b commit eb37460
Show file tree
Hide file tree
Showing 512 changed files with 25,269 additions and 6,870 deletions.
7 changes: 4 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@
"Map": true,
"module": false,
"process": false,
"Promise": false,
"Promise": true,
"requestAnimationFrame": true,
"require": false,
"Set": true,
"setImmediate": true,
"setInterval": false,
"setTimeout": false,
"window": false,
"XMLHttpRequest": false
"XMLHttpRequest": false,
"pit": false
},

"rules": {
Expand Down Expand Up @@ -148,7 +149,7 @@
"no-multi-spaces": 0,
"brace-style": 0, // enforce one true brace style (off by default)
"camelcase": 0, // require camel case names
"consistent-this": 1, // enforces consistent naming when capturing the current execution context (off by default)
"consistent-this": [1, "self"], // enforces consistent naming when capturing the current execution context (off by default)
"eol-last": 1, // enforce newline at the end of file, with no multiple empty lines
"func-names": 0, // require function expressions to have a name (off by default)
"func-style": 0, // enforces use of function declarations or expressions (off by default)
Expand Down
5 changes: 1 addition & 4 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@

# Ignore react-tools where there are overlaps, but don't ignore anything that
# react-native relies on
.*/node_modules/react-tools/src/vendor/.*
.*/node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js
.*/node_modules/react-tools/src/browser/.*
.*/node_modules/react-tools/src/core/ReactInstanceHandles.js
.*/node_modules/react-tools/src/event/.*

# Ignore jest
.*/react-native/node_modules/jest-cli/.*

# Ignore Libraries
.*/Libraries/.*

[include]

[libs]
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Xcode
#
!**/*.xcodeproj
!**/*.pbxproj
!**/*.xcworkspacedata
Expand All @@ -22,4 +21,8 @@ DerivedData
*.ipa
*.xcuserstate

# OS X
.DS_Store

# Node
node_modules
31 changes: 28 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
language: node_js
node_js:
- "0.10"
language: objective-c
before_install:
- brew update
- brew reinstall xctool
install:
- brew install watchman
- npm install
before_script:
- npm test
- (npm start > packager.log 2>&1 &) && echo $! > packager.pid

script: ./build.sh 8.1

after_script:
- pkill -9 -F packager.pid
- cat packager.log
- rm packager.log
- rm packager.pid

# Automatically publish the website
after_success: '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && (cd website; npm install; ./setup.sh; ./publish.sh; echo) || echo'

env:
- secure: "g8Xjbslq4R+3oLVgBvXM5QhiJ+7q+H+dH4+sXReyyZ64M5gf32U7oOjQNVkdx79dnGFc6a619otGsX4RiEkQlkiR+4uCgJUIgPwN4YFCIgYu4Z/0FnbbRu5yyywh5zv4WwGmAtMkgGztoMBnps5gCiPUM/RGIqwVk0Ghbmh5c2k="

branches:
only:
- master
Loading

0 comments on commit eb37460

Please sign in to comment.