diff options
| -rw-r--r-- | .eslintrc.json | 1 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .stickler.yml | 5 | ||||
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rwxr-xr-x | .travis/omit-dist.sh | 5 | ||||
| -rwxr-xr-x | .travis/prevent-base-master.sh | 5 | ||||
| -rw-r--r-- | src/js/captions.js | 2 |
7 files changed, 24 insertions, 6 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index c53bf908..ae86f34f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,6 +10,7 @@ "jQuery": false }, "rules": { + "import/no-cycle": 1, "no-const-assign": 1, "no-shadow": 0, "no-this-before-super": 1, @@ -5,6 +5,7 @@ aws.json !dist/blank.mp4 index-*.html npm-debug.log -*.webm +yarn-error.log package-lock.json +*.webm .idea/
\ No newline at end of file diff --git a/.stickler.yml b/.stickler.yml new file mode 100644 index 00000000..717ba28c --- /dev/null +++ b/.stickler.yml @@ -0,0 +1,5 @@ +linters: + eslint: +files: + ignore: + - 'node_modules/*' diff --git a/.travis.yml b/.travis.yml index d2722414..3203fb95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: node_js -node_js: - - 'lts/*' +node_js: lts/* script: - - npm run lint - - npm run build +- bash .travis/prevent-base-master.sh +- bash .travis/omit-dist.sh +- npm run lint +- npm run build diff --git a/.travis/omit-dist.sh b/.travis/omit-dist.sh new file mode 100755 index 00000000..f107a6b9 --- /dev/null +++ b/.travis/omit-dist.sh @@ -0,0 +1,5 @@ +#!/bin/bash +if [ $TRAVIS_BRANCH == "develop" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qE "^(demo/)?dist/"); then + echo 'Build output ("dist" and "demo/dist") not permitted in develop' >&2 + exit 1 +fi diff --git a/.travis/prevent-base-master.sh b/.travis/prevent-base-master.sh new file mode 100755 index 00000000..54536a66 --- /dev/null +++ b/.travis/prevent-base-master.sh @@ -0,0 +1,5 @@ +#!/bin/bash +if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ $TRAVIS_BRANCH == "master" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q "^src/"); then + echo 'The base branch for pull requests must be "develop"' >&2 + exit 1 +fi diff --git a/src/js/captions.js b/src/js/captions.js index 9dca5505..14f77a2e 100644 --- a/src/js/captions.js +++ b/src/js/captions.js @@ -84,7 +84,7 @@ const captions = { // * toggled: The real captions state const languages = dedupe( - Array.from(navigator.languages || navigator.userLanguage).map(language => language.split('-')[0]), + Array.from(navigator.languages || navigator.language || navigator.userLanguage).map(language => language.split('-')[0]), ); let language = (this.storage.get('language') || this.config.captions.language || 'auto').toLowerCase(); |