From 2ba68198767ebe240ae7e7f6578fb22fa413b19f Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 1 Jan 2020 14:48:32 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BA=D0=BE=D0=BD=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=20=D0=BD=D0=B0=20https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 128 ------------------ .../Reader/SettingsPage/SettingsPage.vue | 10 +- client/store/modules/reader.js | 5 - 3 files changed, 1 insertion(+), 142 deletions(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index a0d05a6c..aef9a36f 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -1,8 +1,5 @@ @@ -285,8 +200,6 @@ class Reader extends Vue { whatsNewVisible = false; whatsNewContent = ''; - migrationVisible1 = false; - migrationVisible2 = false; created() { this.loading = true; @@ -346,7 +259,6 @@ class Reader extends Vue { this.loading = false; await this.showWhatsNew(); - await this.showMigration(); this.updateRoute(); })(); @@ -360,7 +272,6 @@ class Reader extends Vue { this.clickControl = settings.clickControl; this.blinkCachedLoad = settings.blinkCachedLoad; this.showWhatsNewDialog = settings.showWhatsNewDialog; - this.showMigrationDialog = settings.showMigrationDialog; this.showToolButton = settings.showToolButton; this.enableSitesFilter = settings.enableSitesFilter; @@ -426,41 +337,6 @@ class Reader extends Vue { } } - async showMigration() { - await utils.sleep(3000); - if (!this.settingsActive && - this.mode == 'omnireader' && this.showMigrationDialog && this.migrationRemindDate != utils.formatDate(new Date(), 'coDate')) { - if (window.location.protocol == 'http:') { - this.migrationVisible1 = true; - } else if (window.location.protocol == 'https:') { - this.migrationVisible2 = true; - } - } - } - - get isShowMigrationWarning() { - return window.location.protocol == 'http:'; - } - - showMigrationHttp() { - this.migrationVisible1 = true; - } - - migrationDialogDisable() { - this.migrationVisible1 = false; - this.migrationVisible2 = false; - if (this.showMigrationDialog) { - const newSettings = Object.assign({}, this.settings, { showMigrationDialog: false }); - this.commit('reader/setSettings', newSettings); - } - } - - migrationDialogRemind() { - this.migrationVisible1 = false; - this.migrationVisible2 = false; - this.commit('reader/setMigrationRemindDate', utils.formatDate(new Date(), 'coDate')); - } - openVersionHistory() { this.whatsNewVisible = false; this.versionHistoryToggle(); @@ -579,10 +455,6 @@ class Reader extends Vue { return this.$store.state.reader.whatsNewContentHash; } - get migrationRemindDate() { - return this.$store.state.reader.migrationRemindDate; - } - addAction(pos) { let a = this.actionList; if (!a.length || a[a.length - 1] != pos) { diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index b407cd4a..d7e736c2 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -471,18 +471,10 @@ Показывать уведомление "Что нового" - - - - Уведомлять о переходе на httpS-версию - - -
Прочее
+
Другое
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index 154021e5..7e25c9c4 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -182,7 +182,6 @@ const settingDefaults = { imageFitWidth: true, showServerStorageMessages: true, showWhatsNewDialog: true, - showMigrationDialog: true, enableSitesFilter: true, fontShifts: {}, @@ -205,7 +204,6 @@ const state = { profilesRev: 0, allowProfilesSave: false,//подстраховка для разработки whatsNewContentHash: '', - migrationRemindDate: '', currentProfile: '', settings: Object.assign({}, settingDefaults), settingsRev: {}, @@ -240,9 +238,6 @@ const mutations = { setWhatsNewContentHash(state, value) { state.whatsNewContentHash = value; }, - setMigrationRemindDate(state, value) { - state.migrationRemindDate = value; - }, setCurrentProfile(state, value) { state.currentProfile = value; },