Skip to content
This repository has been archived by the owner on Sep 25, 2018. It is now read-only.

Commit

Permalink
Merge pull request #44 from jbeard4/eventless-transition-2-issue-196
Browse files Browse the repository at this point in the history
Eventless transition, issue 196
  • Loading branch information
jbeard4 authored Apr 5, 2017
2 parents 9560710 + 9c17907 commit b2219b5
Show file tree
Hide file tree
Showing 10 changed files with 1,133 additions and 134 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: node_js
node_js:
- 4.2.2
- 4.8.2
before_script:
- npm install grunt-cli -g
addons:
sauce_connect:
username: "jbeard4"
username: "jbeard43"
jwt:
secure: PbQLq/uecF7vElS0h9RtvLp9U43dSzg7z4IAkttmyxxMqGCxKTsloRrcfFS7MFmXxjMFe+7rDWeFQoUtd7sNyB159hre8xjH5WF0oAf6M2xnUSZUU9DkjK84HW2DKf+RFQHu2bUKX4qh8lzMkhIAmrtBjYCWJ8kkgzxHqj6G42Q=
secure: gj7f0pJiRSmKguXfQh/Rj+A7r7sOCbrlbCAz0JjhoV4J1GH8fLfqkQtH3zZFeFADOvJzVEP5Kpa4EvAtjKm/iD8v+zg3F69FIg//MfH0EeC6sc3Gd7qYg6iEo2bRO6KtavfWigFJzIryjqYodjYnuqHfqO7kyRLlGnJHFGENVJU=
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module.exports = function(grunt) {
build: process.env.TRAVIS_JOB_ID,
testname: 'custom tests',
throttled: 5,
statusCheckAttempts : -1,
statusCheckAttempts : 180,
sauceConfig: {
'video-upload-on-pass': false
}
Expand Down Expand Up @@ -122,6 +122,6 @@ module.exports = function(grunt) {
grunt.registerTask('run-browser-tests-dev', ['express:dev', 'saucelabs-custom', 'express:dev:stop' ]);
grunt.registerTask('run-browser-tests-prod', ['express:prod', 'saucelabs-custom', 'express:prod:stop' ]);
grunt.registerTask('run-browser-tests-prod-require', ['express:prod-require', 'saucelabs-custom','express:prod-require:stop' ]);
grunt.registerTask('build', ['babel', 'replace-reserved-words', 'uglify']);
grunt.registerTask('build', ['browserify', 'babel', 'replace-reserved-words', 'uglify']);
grunt.registerTask('default', ['build']);
};
119 changes: 77 additions & 42 deletions dist/scion.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scion.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/scion.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit b2219b5

Please sign in to comment.