From eaf5ac47f308fb4a1fc608bc862de5e01885f128 Mon Sep 17 00:00:00 2001 From: Chad Bailey Date: Sat, 15 Feb 2020 16:11:57 -0600 Subject: [PATCH] A few small fixes #586 (#591) * Trimmed trailing whitespace * Fixed erroneous newline at beginning of blacklist * Fixed erroneous instructions for adding remote in contribution guide (Fixes #586) --- .github/workflows/chrome-store-upload.yaml | 8 ++++---- CONTRIBUTING.md | 2 +- inject.js | 2 +- options.js | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/chrome-store-upload.yaml b/.github/workflows/chrome-store-upload.yaml index eb1adcf..2d909e8 100644 --- a/.github/workflows/chrome-store-upload.yaml +++ b/.github/workflows/chrome-store-upload.yaml @@ -1,6 +1,6 @@ name: Upload To Chrome Web Store # This workflow is triggered on pushes to the repository. -on: +on: push: tags: - v** @@ -11,13 +11,13 @@ jobs: steps: - name: checkout uses: actions/checkout@v1 - + - name: zip uses: montudor/action-zip@v0.1.0 with: args: zip -r ./vscd.zip . -i * -x *.git* - - - name: Upload to + + - name: Upload to uses: trmcnvn/chrome-addon@v1 with: # extension is only necessary when updating an existing addon, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 87df582..ce54189 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,7 +79,7 @@ pre-commit checks before committing via `pre-commit run --all-files` You should always be working with the latest version of the tool to make pull requests easy. If you want to do this easily, just add a second remote to your local git repo like this -`git push --set-upstream origin feature/578-prettier.io-formatting` +`git remote add upstream https://github.com/igrigorik/videospeed.git` Now any time you like to pull the latest version in to your local branch you can simply issue the command `git pull upstream master` diff --git a/inject.js b/inject.js index f1dda0f..fb13754 100644 --- a/inject.js +++ b/inject.js @@ -12,7 +12,7 @@ var tc = { startHidden: false, // default: false controllerOpacity: 0.3, // default: 0.3 keyBindings: [], - blacklist: ` + blacklist: `\ www.instagram.com twitter.com vine.co diff --git a/options.js b/options.js index 721c83a..865195f 100644 --- a/options.js +++ b/options.js @@ -17,7 +17,7 @@ var tcDefaults = { { action: "reset", key: 82, value: 1, force: false, predefined: true }, // R { action: "fast", key: 71, value: 1.8, force: false, predefined: true } // G ], - blacklist: ` + blacklist: `\ www.instagram.com twitter.com vine.co @@ -143,9 +143,9 @@ function add_shortcut() { - - - + + +