From 79d1ee4f481699614353f43d8ce1f3f5a714e8bd Mon Sep 17 00:00:00 2001 From: MayaWolf Date: Sun, 8 Apr 2018 02:22:32 +0200 Subject: [PATCH] 0.2.19 - Lots of polish for stable release. --- LICENSE | 2 +- bbcode/Editor.vue | 6 +- bbcode/core.ts | 4 +- bbcode/standard.ts | 4 +- chat/ChannelList.vue | 14 +- chat/Chat.vue | 35 +- chat/ChatView.vue | 43 +- chat/ConversationSettings.vue | 2 +- chat/ConversationView.vue | 20 +- chat/Logs.vue | 93 ++- chat/ReportDialog.vue | 7 +- chat/SettingsView.vue | 17 +- chat/Sidebar.vue | 2 +- chat/UserList.vue | 23 +- chat/UserMenu.vue | 12 +- chat/bbcode.ts | 2 +- chat/common.ts | 1 + chat/conversations.ts | 28 +- chat/core.ts | 2 +- chat/interfaces.ts | 13 +- chat/localize.ts | 19 +- chat/message_view.ts | 4 +- chat/slash_commands.ts | 52 +- chat/user_view.ts | 5 +- components/Modal.vue | 2 +- electron/Index.vue | 23 +- electron/Window.vue | 32 +- electron/application.json | 2 +- electron/chat.ts | 7 +- electron/common.ts | 4 +- electron/filesystem.ts | 89 ++- electron/main.ts | 15 +- electron/notifications.ts | 1 + fchat/connection.ts | 28 +- fchat/interfaces.ts | 1 + mobile/Index.vue | 11 +- .../src/main/kotlin/net/f_list/fchat/Logs.kt | 52 +- .../kotlin/net/f_list/fchat/MainActivity.kt | 8 +- mobile/android/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +- mobile/chat.ts | 12 +- mobile/filesystem.ts | 33 +- mobile/ios/F-Chat/Logs.swift | 52 +- mobile/ios/F-Chat/Notification.swift | 10 +- mobile/ios/F-Chat/ViewController.swift | 18 +- mobile/ios/F-Chat/native.js | 10 +- package.json | 36 +- readme.md | 5 + scss/_bbcode_editor.scss | 3 + scss/_chat.scss | 64 +- scss/_core.scss | 1 + scss/_flist_derived.scss | 3 +- scss/themes/variables/_dark_variables.scss | 7 +- scss/themes/variables/_default_variables.scss | 6 +- scss/themes/variables/_light_variables.scss | 15 +- site/character_page/character_page.vue | 2 +- site/character_page/guestbook.vue | 5 +- site/character_page/images.vue | 2 +- site/utils.ts | 2 +- webchat/chat.ts | 35 +- webchat/logs.ts | 148 ++-- webchat/package.json | 2 +- yarn.lock | 669 +++++++++++------- 63 files changed, 1159 insertions(+), 673 deletions(-) diff --git a/LICENSE b/LICENSE index 21905c8..a604a53 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 F-List +Copyright (c) 2018 F-List Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/bbcode/Editor.vue b/bbcode/Editor.vue index e8c902f..ebe6949 100644 --- a/bbcode/Editor.vue +++ b/bbcode/Editor.vue @@ -1,16 +1,16 @@ @@ -37,6 +44,7 @@ import Conversations from './conversations'; import core from './core'; import l from './localize'; + import Logs from './Logs.vue'; type BBCodeNode = Node & {bbcodeTag?: string, bbcodeParam?: string, bbcodeHide?: boolean}; @@ -71,7 +79,7 @@ } @Component({ - components: {chat: ChatView, modal: Modal} + components: {chat: ChatView, modal: Modal, logs: Logs} }) export default class Chat extends Vue { @Prop({required: true}) @@ -79,6 +87,8 @@ @Prop({required: true}) readonly defaultCharacter!: string | undefined; selectedCharacter = this.defaultCharacter || this.ownCharacters[0]; //tslint:disable-line:strict-boolean-expressions + @Prop() + readonly version?: string; error = ''; connecting = false; connected = false; @@ -86,11 +96,7 @@ copyPlain = false; mounted(): void { - window.addEventListener('beforeunload', (e) => { - if(!this.connected) return; - e.returnValue = l('chat.confirmLeave'); - return l('chat.confirmLeave'); - }); + document.title = l('title', core.connection.character); document.addEventListener('copy', ((e: ClipboardEvent) => { if(this.copyPlain) { this.copyPlain = false; @@ -111,6 +117,7 @@ if(getKey(e) === Keys.KeyC && e.shiftKey && (e.ctrlKey || e.metaKey) && !e.altKey) { this.copyPlain = true; document.execCommand('copy'); + e.preventDefault(); } }); core.register('characters', Characters(core.connection)); @@ -121,6 +128,7 @@ if(this.connected) core.notifications.playSound('logout'); this.connected = false; this.connecting = false; + document.title = l('title'); }); core.connection.onEvent('connecting', async() => { this.connecting = true; @@ -132,11 +140,14 @@ this.connecting = false; this.connected = true; core.notifications.playSound('login'); + document.title = l('title.connected', core.connection.character); + }); + core.watch(() => core.conversations.hasNew, (hasNew) => { + document.title = (hasNew ? '💬 ' : '') + l(core.connection.isOpen ? 'title.connected' : 'title', core.connection.character); }); core.connection.onError((e) => { this.error = errorToString(e); this.connecting = false; - this.connected = false; }); } @@ -147,9 +158,11 @@ connect(): void { this.connecting = true; - core.connection.connect(this.selectedCharacter).catch((e) => { - if((e).request !== undefined) this.error = l('login.connectError'); //catch axios network errors - else throw e; + core.connection.connect(this.selectedCharacter).catch((e: Error) => { + if((e).request !== undefined) {//catch axios network errors + this.error = l('login.connectError', e.message); + this.connecting = false; + } else throw e; }); } } diff --git a/chat/ChatView.vue b/chat/ChatView.vue index 811b1f3..30a515b 100644 --- a/chat/ChatView.vue +++ b/chat/ChatView.vue @@ -5,20 +5,20 @@ {{ownCharacter.name}} - {{l('chat.logout')}}
+ {{l('chat.logout')}}
{{l('chat.status')}} - {{l('status.' + ownCharacter.status)}} + {{l('status.' + ownCharacter.status)}}
- + {{l('characterSearch.open')}}
-
+ -
+
{{conversation.character.name}} -
- + - + - +
- + {{l('chat.channels')}}
{{conversation.name}}{{conversation.name}}
@@ -61,7 +61,7 @@ @@ -250,11 +250,9 @@ for(const selector of selectorList) sheet.insertRule(`${selector} { font-size: ${fontSize}px; }`, sheet.cssRules.length); - const lineHeightBase = 1.428571429; - const lineHeight = Math.floor(fontSize * 1.428571429); - const formHeight = (lineHeight + (6 * 2) + 2); - sheet.insertRule(`.form-control { line-height: ${lineHeightBase}; height: ${formHeight}px; }`, sheet.cssRules.length); - sheet.insertRule(`select.form-control { line-height: ${lineHeightBase}; height: ${formHeight}px; }`, sheet.cssRules.length); + const lineHeight = 1.428571429; + sheet.insertRule(`.form-control { line-height: ${lineHeight} }`, sheet.cssRules.length); + sheet.insertRule(`select.form-control { line-height: ${lineHeight} }`, sheet.cssRules.length); } logOut(): void { @@ -307,12 +305,9 @@ text-overflow: ellipsis; white-space: nowrap; } - .fa { + .fas { font-size: 16px; padding: 0 3px; - &:first-child { - padding-left: 0; - } &:last-child { padding-right: 0; } diff --git a/chat/ConversationSettings.vue b/chat/ConversationSettings.vue index 2afb019..58f27cb 100644 --- a/chat/ConversationSettings.vue +++ b/chat/ConversationSettings.vue @@ -1,5 +1,5 @@