Небольшие поправки

This commit is contained in:
Book Pauk
2020-02-04 12:29:54 +07:00
parent cb443157da
commit b784d277e4
2 changed files with 9 additions and 3 deletions

View File

@@ -82,7 +82,7 @@
@stop-text-search="stopTextSearch"> @stop-text-search="stopTextSearch">
</SearchPage> </SearchPage>
<CopyTextPage v-if="copyTextActive" ref="copyTextPage" @copy-text-toggle="copyTextToggle"></CopyTextPage> <CopyTextPage v-if="copyTextActive" ref="copyTextPage" @copy-text-toggle="copyTextToggle"></CopyTextPage>
<RecentBooksPage v-show="recentBooksActive" ref="recentBooksPage" @load-book="loadBook" @recent-books-toggle="recentBooksToggle"></RecentBooksPage> <RecentBooksPage v-show="recentBooksActive" ref="recentBooksPage" @load-book="loadBook" @recent-books-close="recentBooksClose"></RecentBooksPage>
<SettingsPage v-if="settingsActive" ref="settingsPage" @settings-toggle="settingsToggle"></SettingsPage> <SettingsPage v-if="settingsActive" ref="settingsPage" @settings-toggle="settingsToggle"></SettingsPage>
<HelpPage v-if="helpActive" ref="helpPage" @help-toggle="helpToggle"></HelpPage> <HelpPage v-if="helpActive" ref="helpPage" @help-toggle="helpToggle"></HelpPage>
<ClickMapPage v-show="clickMapActive" ref="clickMapPage"></ClickMapPage> <ClickMapPage v-show="clickMapActive" ref="clickMapPage"></ClickMapPage>
@@ -342,7 +342,7 @@ class Reader extends Vue {
const showButtonCount = Object.values(this.showToolButton).reduce((a, b) => a + (b ? 1 : 0), 0); const showButtonCount = Object.values(this.showToolButton).reduce((a, b) => a + (b ? 1 : 0), 0);
if (this.$refs.buttons) if (this.$refs.buttons)
this.$refs.buttons.style.minWidth = 65*showButtonCount + 'px'; this.$refs.buttons.style.minWidth = 65*showButtonCount + 'px';
(async () => { (async() => {
await utils.sleep(1000); await utils.sleep(1000);
if (this.$refs.header) if (this.$refs.header)
this.$refs.header.style.overflowX = 'auto'; this.$refs.header.style.overflowX = 'auto';
@@ -682,6 +682,10 @@ class Reader extends Vue {
} }
} }
recentBooksClose() {
this.recentBooksActive = false;
}
recentBooksToggle() { recentBooksToggle() {
this.recentBooksActive = !this.recentBooksActive; this.recentBooksActive = !this.recentBooksActive;
if (this.recentBooksActive) { if (this.recentBooksActive) {
@@ -916,6 +920,8 @@ class Reader extends Vue {
return; return;
} }
this.closeAllTextPages();
let url = encodeURI(decodeURI(opts.url)); let url = encodeURI(decodeURI(opts.url));
if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) && if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&

View File

@@ -315,7 +315,7 @@ class RecentBooksPage extends Vue {
} }
close() { close() {
this.$emit('recent-books-toggle'); this.$emit('recent-books-close');
} }
keyHook(event) { keyHook(event) {