From d320040728668399b077ce9b07faacfe1a9d1157 Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Tue, 30 May 2023 19:57:24 -0700 Subject: [PATCH] hotfix: color selector cannot be dismissed --- CHANGELOG.md | 3 +++ README.md | 8 ++++---- bbcode/Editor.vue | 15 ++++++--------- docs/_config.yml | 2 +- electron/package.json | 2 +- package.json | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3f37b4..3c9aad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.23.3 +* Hotfix to fix color picker not disappearing + ## 1.23.2 * Hotfix to fix eicon search hanging the client diff --git a/README.md b/README.md index 7ad124a..354c3f8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Download -[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-win.exe) (82 MB) -| [MacOS Intel](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-macos-intel.dmg) (82 MB) -| [MacOS M1](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-macos-m1.dmg) (84 MB) -| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-linux.AppImage) (82 MB) +[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-win.exe) (82 MB) +| [MacOS Intel](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-macos-intel.dmg) (82 MB) +| [MacOS M1](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-macos-m1.dmg) (84 MB) +| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.3/F-Chat-Rising-1.23.3-linux.AppImage) (82 MB) # F-Chat Rising diff --git a/bbcode/Editor.vue b/bbcode/Editor.vue index d209c92..eae9198 100644 --- a/bbcode/Editor.vue +++ b/bbcode/Editor.vue @@ -16,12 +16,6 @@ - - - - - -
@@ -60,6 +54,7 @@ import {Component, Hook, Prop, Watch} from '@f-list/vue-ts'; import _ from 'lodash'; import Vue from 'vue'; + import { mixin as clickaway } from 'vue-clickaway'; import {getKey} from '../chat/common'; import {Keys} from '../keys'; import {BBCodeElement, CoreBBCodeParser, urlRegex} from './core'; @@ -73,7 +68,8 @@ components: { 'icon': IconView, 'EIconSelector': EIconSelector - } + }, + mixins: [ clickaway ] }) export default class Editor extends Vue { @Prop @@ -298,14 +294,15 @@ } apply(button: EditorButton): void { - this.colorPopupVisible = false; - if (button.tag === 'color') { this.colorPopupVisible = !this.colorPopupVisible; return; } else if (button.tag === 'eicon') { this.showEIconSelector(); + this.colorPopupVisible = false; return; + } else { + this.colorPopupVisible = false; } this.applyButtonEffect(button); diff --git a/docs/_config.yml b/docs/_config.yml index 103323f..38502c0 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -50,7 +50,7 @@ theme: jekyll-theme-slate changelog: https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md download: - version: 1.23.2 + version: 1.23.3 url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL% diff --git a/electron/package.json b/electron/package.json index 81eb0f3..2ff12a2 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "fchat", - "version": "1.23.2", + "version": "1.23.3", "author": "The F-List Team and Mister Stallion (Esq.)", "description": "F-List.net Chat Client", "main": "main.js", diff --git a/package.json b/package.json index d46bdc9..2e96c63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "f-list-rising", - "version": "1.23.2", + "version": "1.23.3", "author": "The F-List Team and and Mister Stallion (Esq.)", "description": "A heavily modded F-Chat 3.0 client for F-List", "license": "MIT",