From e7a479097012bb34760f3d8adb5769c5b61d07b6 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Sun, 25 Oct 2020 11:54:36 +0100 Subject: [PATCH 1/5] #91 Added base script file --- src/javascript/enhancements/watch2getherChat.js | 12 ++++++++++++ src/javascript/index.js | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/javascript/enhancements/watch2getherChat.js diff --git a/src/javascript/enhancements/watch2getherChat.js b/src/javascript/enhancements/watch2getherChat.js new file mode 100644 index 0000000..e611c1f --- /dev/null +++ b/src/javascript/enhancements/watch2getherChat.js @@ -0,0 +1,12 @@ +import * as core from '../utils/aniwatchCore'; +import * as helper from '../utils/helpers'; + +export function init() { + core.runAfterLoad(() => { + manipulateChatInput(); + }, "^/watch2gether/.*$"); +} + +function manipulateChatInput(){ + +} \ No newline at end of file diff --git a/src/javascript/index.js b/src/javascript/index.js index 9d86b8a..f09fe58 100644 --- a/src/javascript/index.js +++ b/src/javascript/index.js @@ -6,6 +6,7 @@ import { initHelpers } from './utils/helpers'; import { init as animeRequests } from './enhancements/animeRequests'; import { init as languageDisplay } from './enhancements/languageDisplay'; import { init as quickSearch } from './enhancements/quickSearch'; +import { init as watch2getherChat } from './enhancements/watch2getherChat'; // core initCore(); @@ -16,4 +17,5 @@ initHelpers(); // enhancements animeRequests(); languageDisplay(); -quickSearch(); \ No newline at end of file +quickSearch(); +watch2getherChat(); \ No newline at end of file From 3125e6720f77fdcd4934f8359c6f9de731a1d059 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Sun, 25 Oct 2020 12:47:32 +0100 Subject: [PATCH 2/5] #91 Added base implementation for chat counter Adds uuid dependency to create guids --- package-lock.json | 24 ++++++++++-- package.json | 4 +- .../enhancements/watch2getherChat.js | 38 +++++++++++++++++-- src/stylesheets/aniwatchplus.scss | 3 +- .../enhancements/_watch2gether.scss | 21 ++++++++++ 5 files changed, 81 insertions(+), 9 deletions(-) create mode 100644 src/stylesheets/enhancements/_watch2gether.scss diff --git a/package-lock.json b/package-lock.json index d63b08e..ac58357 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10735,6 +10735,14 @@ "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "require-directory": { @@ -11873,6 +11881,15 @@ "requires": { "temp-dir": "^1.0.0", "uuid": "^3.0.1" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true, + "optional": true + } } }, "ternary-stream": { @@ -12439,10 +12456,9 @@ } }, "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", + "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==" }, "v8flags": { "version": "3.2.0", diff --git a/package.json b/package.json index bcbe472..8f7fe19 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,9 @@ "email": "mail@serraniel.dev" }, "homepage": "https://github.com/Serraniel/AniwatchPlus#readme", - "dependencies": {}, + "dependencies": { + "uuid": "^8.3.1" + }, "devDependencies": { "@babel/compat-data": "^7.12.1", "@babel/core": "^7.12.3", diff --git a/src/javascript/enhancements/watch2getherChat.js b/src/javascript/enhancements/watch2getherChat.js index e611c1f..c8a207e 100644 --- a/src/javascript/enhancements/watch2getherChat.js +++ b/src/javascript/enhancements/watch2getherChat.js @@ -1,12 +1,44 @@ import * as core from '../utils/aniwatchCore'; import * as helper from '../utils/helpers'; +import { v4 as uuidv4 } from 'uuid'; export function init() { core.runAfterLoad(() => { - manipulateChatInput(); + manipulateChatInput(); }, "^/watch2gether/.*$"); } -function manipulateChatInput(){ - +function manipulateChatInput() { + let textarea = document.querySelector('.chat-input textarea'); + + // avoid duplicate registration + if (typeof textarea.dataset.charCounterId !== 'undefined') { + return; + } +} + +function addCharCounter(textarea) { + let chatDiv = textarea.parentElement.parentElement; // div with chat input and controls + let controlRow = chatDiv.children[1]; // row with controls + let btn = controlRow.querySelector('button'); // find send button + + let counterSpan = document.createElement('span'); // create span for counter + counterSpan.classList.add('awp-w2g-chatCounter'); + + // id and "connection" + let counterId = `awp-${v4()}` + counterSpan.id = counterId; + textarea.dataset.charCounterId = counterId; + + btn.parentElement.inserBefore(counterSpan, btn); // and insert in front of the button + + textarea.addEventListener('keypress keyup', () => { + let current = textarea.value.length; + let max = textarea.maxLength; + + counterSpan.innerText = `${current} / ${max}`; + + // animation if at max + counterSpan.classList.toggle('awp-w2g-chatCounter-max', current >= max); + }); } \ No newline at end of file diff --git a/src/stylesheets/aniwatchplus.scss b/src/stylesheets/aniwatchplus.scss index cdcb559..0fcd7c1 100644 --- a/src/stylesheets/aniwatchplus.scss +++ b/src/stylesheets/aniwatchplus.scss @@ -2,4 +2,5 @@ @import './vars/colors'; // enhancements -@import './enhancements/lists.scss'; \ No newline at end of file +@import './enhancements/lists'; +@import './enhancements/watch2gether' \ No newline at end of file diff --git a/src/stylesheets/enhancements/_watch2gether.scss b/src/stylesheets/enhancements/_watch2gether.scss new file mode 100644 index 0000000..731dc5e --- /dev/null +++ b/src/stylesheets/enhancements/_watch2gether.scss @@ -0,0 +1,21 @@ +.awp { + &-w2g { + &-chatCounter { + white-space: nowrap; + + &-max { + animation: shake 0.1s ease-in-out 0.1s 3 alternate; + + @keyframes shake { + from { + transform: rotate(3deg); + } + to { + transform-origin: center center; + transform: rotate(-3deg); + } + } + } + } + } +} From 93747d5cfdee17fc98d656fada0a0f64f24e25cd Mon Sep 17 00:00:00 2001 From: Serraniel Date: Sun, 25 Oct 2020 13:02:24 +0100 Subject: [PATCH 3/5] #91 added comment why this does not work yet --- src/javascript/enhancements/watch2getherChat.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/javascript/enhancements/watch2getherChat.js b/src/javascript/enhancements/watch2getherChat.js index c8a207e..4a5fac6 100644 --- a/src/javascript/enhancements/watch2getherChat.js +++ b/src/javascript/enhancements/watch2getherChat.js @@ -3,6 +3,7 @@ import * as helper from '../utils/helpers'; import { v4 as uuidv4 } from 'uuid'; export function init() { + // UPS // runAfterLoad is not what we want...wait for runAfterLocationChange.... core.runAfterLoad(() => { manipulateChatInput(); }, "^/watch2gether/.*$"); From 6346ae40784582a722c57def8b79f2dc4dde2499 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 04:25:02 +0000 Subject: [PATCH 4/5] Bump postcss from 8.1.3 to 8.1.4 Bumps [postcss](https://github.com/postcss/postcss) from 8.1.3 to 8.1.4. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.1.3...8.1.4) Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index d63b08e..ce2cb23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8113,9 +8113,9 @@ "dev": true }, "nanoid": { - "version": "3.1.15", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.15.tgz", - "integrity": "sha512-n8rXUZ8UU3lV6+43atPrSizqzh25n1/f00Wx1sCiE7R1sSHytZLTTiQl8DjC4IDLOnEZDlgJhy0yO4VsIpMxow==", + "version": "3.1.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz", + "integrity": "sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w==", "dev": true }, "nanomatch": { @@ -8933,9 +8933,9 @@ "dev": true }, "postcss": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.3.tgz", - "integrity": "sha512-AKsHGqd7HmXmL/EgyAjI4Gx719A5yQdt9HzyXrI8M/hzxfumecYS95kfvIt40UZqPVNoEt0Va1M3PG54XtNPbg==", + "version": "8.1.4", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.4.tgz", + "integrity": "sha512-LfqcwgMq9LOd8pX7K2+r2HPitlIGC5p6PoZhVELlqhh2YGDVcXKpkCseqan73Hrdik6nBd2OvoDPUaP/oMj9hQ==", "dev": true, "requires": { "colorette": "^1.2.1", diff --git a/package.json b/package.json index bcbe472..5347f59 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "gulp-terser": "^1.4.0", "gulp-zip": "^5.0.2", "merge-stream": "^2.0.0", - "postcss": "^8.1.3", + "postcss": "^8.1.4", "sass": "^1.27.0", "terser": "^5.3.8", "vinyl-buffer": "^1.0.1", From 4e8ec5e25984304d57df6dbc18c3f6cb1dbacf19 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 26 Oct 2020 18:38:08 +0100 Subject: [PATCH 5/5] #96 Set fixed node version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c7a886..d923d0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "node" + - "14" dist: trusty cache: npm: true