From 593e201f793017d9cbf30fee8afe8b61a8b737cd Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 28 Oct 2020 22:45:05 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B4=20LibsPage=20(ExternalLibs)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/App.vue | 6 +++--- client/components/ExternalLibs/ExternalLibs.vue | 2 +- client/components/Reader/LibsPage/LibsPage.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/components/App.vue b/client/components/App.vue index ac72f33e..ac382f69 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -195,9 +195,9 @@ class App extends Vue { redirectIfNeeded() { if ((this.mode == 'reader' || this.mode == 'omnireader' || this.mode == 'liberama.top')) { const search = window.location.search.substr(1); - //распознавание параметра p , если присутствует, должен совпадать с rootRoute (необходимо для nginx) - const q = utils.parseQuery(search); - if (q.p && `/${q.p}` != this.rootRoute) { + + //распознавание хоста, если присутствует домен 3-уровня "b.", то разрешена только определенная страница + if (window.location.host.indexOf('b.') == 0 && this.rootRoute != '/external-libs') { this.$router.replace('/404'); //чтобы ниоткуда нельзя было изменить путь (если какие-то страницы еще грузятся) this.$router.push = this.$router.replace = null; diff --git a/client/components/ExternalLibs/ExternalLibs.vue b/client/components/ExternalLibs/ExternalLibs.vue index 79207a8a..47046913 100644 --- a/client/components/ExternalLibs/ExternalLibs.vue +++ b/client/components/ExternalLibs/ExternalLibs.vue @@ -96,7 +96,7 @@ class ExternalLibs extends Vue { const openerOrigin2 = `https://${openerHost}`; window.addEventListener('message', (event) => { - if (event.origin != openerOrigin1 && event.origin != openerOrigin2) + if (event.origin !== openerOrigin1 && event.origin !== openerOrigin2) return; if (!_.isObject(event.data) || event.data.from != 'LibsPage') return; diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue index f0069d4e..4727ffac 100644 --- a/client/components/Reader/LibsPage/LibsPage.vue +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -32,7 +32,7 @@ class LibsPage extends Vue { const subdomain = (window.location.protocol != 'http:' ? 'b.' : ''); const origin = `http://${subdomain}${window.location.host}`; - this.popupWindow = window.open(`${origin}/?p=external-libs#/external-libs`); + this.popupWindow = window.open(`${origin}/#/external-libs`); if (this.popupWindow) {