diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index c8fd99c0..b0002f9a 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -543,9 +543,7 @@ class Reader {
//обновим settings, если загружали обои из /upload/
if (updated) {
- const newSettings = _.cloneDeep(this.settings);
- newSettings.needUpdateSettingsView = (newSettings.needUpdateSettingsView < 10 ? newSettings.needUpdateSettingsView + 1 : 0);
- this.commit('reader/setSettings', newSettings);
+ this.commit('reader/setSettings', {});
}
dynamicCss.replace('wallpapers', newCss);
diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index 19b2ec2d..6391d3a8 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -23,7 +23,6 @@
stretch
inline-label
>
-
@@ -33,7 +32,6 @@
-
@@ -41,47 +39,7 @@
-
+
@@ -115,10 +73,10 @@ import wallpaperStorage from '../share/wallpaperStorage';
import readerApi from '../../../api/reader';
import rstore from '../../../store/modules/reader';
-import defPalette from './defPalette';
//pages
import ProfilesTab from './ProfilesTab/ProfilesTab.vue';
+import ViewTab from './ViewTab/ViewTab.vue';
import ToolBarTab from './ToolBarTab/ToolBarTab.vue';
import KeysTab from './KeysTab/KeysTab.vue';
import PageMoveTab from './PageMoveTab/PageMoveTab.vue';
@@ -134,6 +92,7 @@ const componentOptions = {
Window,
//pages
ProfilesTab,
+ ViewTab,
ToolBarTab,
KeysTab,
PageMoveTab,
@@ -200,13 +159,6 @@ const componentOptions = {
if (hex.test(newValue))
this.backgroundColor = newValue;
},
- dualDivColor(newValue) {
- this.dualDivColorFiltered = newValue;
- },
- dualDivColorFiltered(newValue) {
- if (hex.test(newValue))
- this.dualDivColor = newValue;
- },
statusBarColor(newValue) {
this.statusBarColorFiltered = newValue;
},
@@ -222,39 +174,29 @@ class SettingsPage {
form = {};
selectedTab = 'profiles';
- selectedViewTab = 'mode';
- fontBold = false;
- fontItalic = false;
- vertShift = 0;
- tabsScrollable = false;
- textColorFiltered = '';
- bgColorFiltered = '';
- dualDivColorFiltered = '';
- statusBarColorFiltered = '';
-
- webFonts = [];
- fonts = [];
setsChanged = false;
+ fontBold = false;
+ fontItalic = false;
+ vertShift = 0;
+ textColorFiltered = '';
+ bgColorFiltered = '';
+ statusBarColorFiltered = '';
+ webFonts = [];
+ fonts = [];
+
created() {
this.commit = this.$store.commit;
- this.reader = this.$store.state.reader;
this.debouncedCommitSettings = _.debounce(() => {
this.commit('reader/setSettings', _.cloneDeep(this.form));
- }, 100);
+ }, 50);
this.settingsChanged();//no await
}
mounted() {
- this.$watch(
- '$refs.tabs.scrollable',
- (newValue) => {
- this.tabsScrollable = newValue && !this.$root.isMobileDevice;
- }
- );
}
init() {
@@ -263,9 +205,6 @@ class SettingsPage {
}
async settingsChanged() {
- if (_.isEqual(this.form, this.settings))
- return;
-
this.setsChanged = true;
try {
this.form = _.cloneDeep(this.settings);
@@ -326,55 +265,6 @@ class SettingsPage {
return result;
}
- get predefineTextColors() {
- return defPalette.concat([
- '#ffffff',
- '#000000',
- '#202020',
- '#323232',
- '#aaaaaa',
- '#00c0c0',
- '#ebe2c9',
- '#cfdc99',
- '#478355',
- '#909080',
- ]);
- }
-
- get predefineBackgroundColors() {
- return defPalette.concat([
- '#ffffff',
- '#000000',
- '#202020',
- '#ebe2c9',
- '#cfdc99',
- '#478355',
- '#a6caf0',
- '#909080',
- '#808080',
- '#c8c8c8',
- ]);
- }
-
- colorPanStyle(type) {
- let result = 'width: 30px; height: 30px; border: 1px solid black; border-radius: 4px;';
- switch (type) {
- case 'text':
- result += `background-color: ${this.textColor};`
- break;
- case 'bg':
- result += `background-color: ${this.backgroundColor};`
- break;
- case 'div':
- result += `background-color: ${this.dualDivColor};`
- break;
- case 'statusbar':
- result += `background-color: ${this.statusBarColor};`
- break;
- }
- return result;
- }
-
needReload() {
this.$root.notify.warning('Необходимо обновить страницу (F5), чтобы изменения возымели эффект');
}
@@ -517,20 +407,6 @@ export default vueComponent(SettingsPage);
.tab {
justify-content: initial;
}
-
-.label-2 {
- width: 110px;
-}
-
-.input {
- max-width: 150px;
-}
-
-.no-mp {
- margin: 0;
- padding: 0;
-}
-
diff --git a/client/components/Reader/SettingsPage/ViewTab/ViewTab.vue b/client/components/Reader/SettingsPage/ViewTab/ViewTab.vue
new file mode 100644
index 00000000..fb204c05
--- /dev/null
+++ b/client/components/Reader/SettingsPage/ViewTab/ViewTab.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+