kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotfix: color selector cannot be dismissed

This commit is contained in:
Mr. Stallion 2023-05-30 19:57:24 -07:00
parent 37b61c14c0
commit d320040728
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## 1.23.3
* Hotfix to fix color picker not disappearing
## 1.23.2 ## 1.23.2
* Hotfix to fix eicon search hanging the client * Hotfix to fix eicon search hanging the client

8
README.md
View File

@ -1,8 +1,8 @@
# Download # Download
[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.23.2/F-Chat-Rising-1.23.2-win.exe) (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.2/F-Chat-Rising-1.23.2-macos-intel.dmg) (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.2/F-Chat-Rising-1.23.2-macos-m1.dmg) (84 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.2/F-Chat-Rising-1.23.2-linux.AppImage) (82 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 # F-Chat Rising

15
bbcode/Editor.vue
View File

@ -16,12 +16,6 @@
</div> </div>
</div> </div>
<!-- <div class="popover popover-top eicon-selector" :class="{ big: type === 'big' }" v-show="eiconPopupVisible" v-on-clickaway="dismissEIconSelector">-->
<!-- <div class="popover-body">-->
<!-- <EIconSelector :onSelect="onSelectEIcon" ref="eIconSelector"></EIconSelector>-->
<!-- </div>-->
<!-- </div>-->
<EIconSelector :onSelect="onSelectEIcon" ref="eIconSelector"></EIconSelector> <EIconSelector :onSelect="onSelectEIcon" ref="eIconSelector"></EIconSelector>
<div class="btn-group toolbar-buttons" style="flex-wrap:wrap"> <div class="btn-group toolbar-buttons" style="flex-wrap:wrap">
@ -60,6 +54,7 @@
import {Component, Hook, Prop, Watch} from '@f-list/vue-ts'; import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
import _ from 'lodash'; import _ from 'lodash';
import Vue from 'vue'; import Vue from 'vue';
import { mixin as clickaway } from 'vue-clickaway';
import {getKey} from '../chat/common'; import {getKey} from '../chat/common';
import {Keys} from '../keys'; import {Keys} from '../keys';
import {BBCodeElement, CoreBBCodeParser, urlRegex} from './core'; import {BBCodeElement, CoreBBCodeParser, urlRegex} from './core';
@ -73,7 +68,8 @@
components: { components: {
'icon': IconView, 'icon': IconView,
'EIconSelector': EIconSelector 'EIconSelector': EIconSelector
} },
mixins: [ clickaway ]
}) })
export default class Editor extends Vue { export default class Editor extends Vue {
@Prop @Prop
@ -298,14 +294,15 @@
} }
apply(button: EditorButton): void { apply(button: EditorButton): void {
this.colorPopupVisible = false;
if (button.tag === 'color') { if (button.tag === 'color') {
this.colorPopupVisible = !this.colorPopupVisible; this.colorPopupVisible = !this.colorPopupVisible;
return; return;
} else if (button.tag === 'eicon') { } else if (button.tag === 'eicon') {
this.showEIconSelector(); this.showEIconSelector();
this.colorPopupVisible = false;
return; return;
} else {
this.colorPopupVisible = false;
} }
this.applyButtonEffect(button); this.applyButtonEffect(button);

2
docs/_config.yml
View File

@ -50,7 +50,7 @@ theme: jekyll-theme-slate
changelog: https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md changelog: https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md
download: 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% url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL%

2
electron/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fchat", "name": "fchat",
"version": "1.23.2", "version": "1.23.3",
"author": "The F-List Team and Mister Stallion (Esq.)", "author": "The F-List Team and Mister Stallion (Esq.)",
"description": "F-List.net Chat Client", "description": "F-List.net Chat Client",
"main": "main.js", "main": "main.js",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "f-list-rising", "name": "f-list-rising",
"version": "1.23.2", "version": "1.23.3",
"author": "The F-List Team and and Mister Stallion (Esq.)", "author": "The F-List Team and and Mister Stallion (Esq.)",
"description": "A heavily modded F-Chat 3.0 client for F-List", "description": "A heavily modded F-Chat 3.0 client for F-List",
"license": "MIT", "license": "MIT",