From 5626a3c3890a67c779f37001de0a990559b90264 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Fri, 29 Jun 2018 19:45:33 -0400 Subject: [PATCH] 4.0.0-rc3.3. * Update all usages of `tw-input` and `tw-select` to use the new, overly-verbose classes Twitch added. * Add a few of the monkey faces to the local emote code to make them work. * Override emotes when building the emote code <-> id map, to let emotes from higher sets override global emotes. --- changelog.html | 8 +++++++- src/main.js | 2 +- src/modules/chat/actions/components/edit-ban.vue | 2 +- .../chat/actions/components/edit-chat.vue | 2 +- .../chat/actions/components/edit-icon.vue | 8 +++----- .../chat/actions/components/edit-image.vue | 2 +- .../chat/actions/components/edit-text.vue | 2 +- .../chat/actions/components/edit-timeout.vue | 4 ++-- src/modules/chat/actions/components/edit-url.vue | 2 +- src/modules/chat/tokenizers.jsx | 5 +---- .../main_menu/components/action-editor.vue | 12 ++++++------ .../main_menu/components/chat-actions.vue | 2 +- .../main_menu/components/color-picker.vue | 2 +- src/modules/main_menu/components/experiments.vue | 6 +++--- .../main_menu/components/profile-selector.vue | 2 +- .../main_menu/components/setting-select-box.vue | 2 +- .../main_menu/components/setting-text-box.vue | 2 +- src/modules/main_menu/components/term-editor.vue | 8 ++++++-- .../twitch-twilight/modules/chat/emote_menu.jsx | 8 ++------ src/sites/twitch-twilight/modules/chat/index.js | 16 ++++++++++------ 20 files changed, 51 insertions(+), 46 deletions(-) diff --git a/changelog.html b/changelog.html index 994851a8..e239929d 100644 --- a/changelog.html +++ b/changelog.html @@ -1,4 +1,10 @@ -
4.0.0-rc3.1@662c50c7e3e4ac110441
+
4.0.0-rc3.3@85ad2d458fb808c0365f
+ + +
4.0.0-rc3.1@662c50c7e3e4ac110441
diff --git a/src/main.js b/src/main.js index 12a6908f..b34cbef4 100644 --- a/src/main.js +++ b/src/main.js @@ -100,7 +100,7 @@ class FrankerFaceZ extends Module { FrankerFaceZ.Logger = Logger; const VER = FrankerFaceZ.version_info = { - major: 4, minor: 0, revision: 0, extra: '-rc3.1', + major: 4, minor: 0, revision: 0, extra: '-rc3.3', build: __webpack_hash__, toString: () => `${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}` diff --git a/src/modules/chat/actions/components/edit-ban.vue b/src/modules/chat/actions/components/edit-ban.vue index 5e379644..c37ec6ca 100644 --- a/src/modules/chat/actions/components/edit-ban.vue +++ b/src/modules/chat/actions/components/edit-ban.vue @@ -8,7 +8,7 @@ diff --git a/src/modules/chat/actions/components/edit-chat.vue b/src/modules/chat/actions/components/edit-chat.vue index 3fc204f6..3ac31855 100644 --- a/src/modules/chat/actions/components/edit-chat.vue +++ b/src/modules/chat/actions/components/edit-chat.vue @@ -9,7 +9,7 @@ id="edit_chat" v-model="value.command" :placeholder="defaults.command" - class="tw-mg-y-05 tw-input tw-display-inline" + class="tw-border-radius-medium tw-font-size-6 tw-full-width tw-input tw-pd-x-1 tw-pd-y-05 tw-mg-y-05" @input="$emit('input', value)" > diff --git a/src/modules/chat/actions/components/edit-icon.vue b/src/modules/chat/actions/components/edit-icon.vue index a8c46db2..6a3838ca 100644 --- a/src/modules/chat/actions/components/edit-icon.vue +++ b/src/modules/chat/actions/components/edit-icon.vue @@ -10,17 +10,15 @@ {{ t('setting.actions.icon.search', 'Search for Icon') }}
-
-
-
-
+
+
diff --git a/src/modules/chat/actions/components/edit-text.vue b/src/modules/chat/actions/components/edit-text.vue index cf8ecf9b..5a15d2ba 100644 --- a/src/modules/chat/actions/components/edit-text.vue +++ b/src/modules/chat/actions/components/edit-text.vue @@ -7,7 +7,7 @@
diff --git a/src/modules/chat/actions/components/edit-timeout.vue b/src/modules/chat/actions/components/edit-timeout.vue index 1b98f09c..c11e12a8 100644 --- a/src/modules/chat/actions/components/edit-timeout.vue +++ b/src/modules/chat/actions/components/edit-timeout.vue @@ -9,7 +9,7 @@ id="edit_duration" v-model.number="value.duration" :placeholder="defaults.duration" - class="tw-mg-y-05 tw-input tw-display-inline" + class="tw-border-radius-medium tw-font-size-6 tw-full-width tw-input tw-pd-x-1 tw-pd-y-05 tw-mg-y-05" type="number" @input="$emit('input', value)" > @@ -23,7 +23,7 @@ diff --git a/src/modules/chat/actions/components/edit-url.vue b/src/modules/chat/actions/components/edit-url.vue index e810981c..b835c186 100644 --- a/src/modules/chat/actions/components/edit-url.vue +++ b/src/modules/chat/actions/components/edit-url.vue @@ -9,7 +9,7 @@ id="edit_url" v-model="value.url" :placeholder="defaults.url" - class="tw-mg-y-05 tw-input tw-display-inline" + class="tw-border-radius-medium tw-font-size-6 tw-full-width tw-input tw-pd-x-1 tw-pd-y-05 tw-mg-y-05" @input="$emit('input', value)" > diff --git a/src/modules/chat/tokenizers.jsx b/src/modules/chat/tokenizers.jsx index 68512169..dea31ec5 100644 --- a/src/modules/chat/tokenizers.jsx +++ b/src/modules/chat/tokenizers.jsx @@ -683,10 +683,7 @@ export const AddonEmotes = { if ( source === '--global--' || emote_id === 80393 ) source = this.i18n.t('emote.global', 'Twitch Global'); - else if ( source === '--twitch-turbo--' || source === 'turbo' || source === '--turbo-faces--' ) - source = this.i18n.t('emote.turbo', 'Twitch Turbo'); - - else if ( source === '--prime--' || source === '--prime-faces--' ) + else if ( source === '--twitch-turbo--' || source === 'turbo' || source === '--turbo-faces--' || source === '--prime--' || source === '--prime-faces--' ) source = this.i18n.t('emote.prime', 'Twitch Prime'); else diff --git a/src/modules/main_menu/components/action-editor.vue b/src/modules/main_menu/components/action-editor.vue index ac971ae2..16dbd996 100644 --- a/src/modules/main_menu/components/action-editor.vue +++ b/src/modules/main_menu/components/action-editor.vue @@ -23,7 +23,7 @@ @@ -36,7 +36,7 @@ id="renderer_type" ref="renderer_type" v-model="edit_data.appearance.type" - class="tw-mg-y-05 tw-select tw-display-inline" + class="tw-border-radius-medium tw-font-size-6 tw-full-width tw-select tw-pd-l-1 tw-pd-r-3 tw-pd-y-05 tw-mg-y-05" > @@ -96,7 +96,7 @@ @@ -132,7 +132,7 @@ @@ -40,7 +40,7 @@
{{ term_type }} - diff --git a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx index c6ed9e69..cd2698a5 100644 --- a/src/sites/twitch-twilight/modules/chat/emote_menu.jsx +++ b/src/sites/twitch-twilight/modules/chat/emote_menu.jsx @@ -809,11 +809,7 @@ export default class EmoteMenu extends Module { title = t.i18n.t('emote-menu.global', 'Global Emotes'); sort_key = 100; - } else if ( title === '--twitch-turbo--' || title === 'turbo' || title === '--turbo-faces--' ) { - title = t.i18n.t('emote-menu.turbo', 'Turbo'); - sort_key = 75; - - } else if ( title === '--prime--' || title === '--prime-faces--' ) { + } else if ( title === '--twitch-turbo--' || title === 'turbo' || title === '--turbo-faces--' || title === '--prime--' || title === '--prime-faces--' ) { title = t.i18n.t('emote-menu.prime', 'Prime'); icon = 'crown'; sort_key = 75; @@ -1232,7 +1228,7 @@ export default class EmoteMenu extends Module {
'] }; @@ -598,12 +603,11 @@ export default class ChatHook extends Module { for(const emote of set.emotes) if ( emote ) { const token = emote.token; - if ( has(REGEX_EMOTES, token) ) { - for(const token of REGEX_EMOTES[token] ) - if ( ! has(emotes, token) ) - emotes[token] = emote.id; + if ( Array.isArray(REGEX_EMOTES[token]) ) { + for(const tok of REGEX_EMOTES[token] ) + emotes[tok] = emote.id; - } else if ( ! has(emotes, token) ) + } else emotes[token] = emote.id; }