ru.coon 2.7.9 → 2.7.11

package/src/userSettings.js

@@ -1,161 +1,161 @@
-Ext.define('Coon.userSettings', {
-    singleton: true,
-
-    requires: [
-        'Coon.common.component.settings.modules.settingClosePageConfirmation',
-        'Coon.common.component.settings.modules.settingwindowHolder',
-        'Coon.common.component.settings.stores.userSettingsStoreService'
-    ],
-
-    settingHandlers: [],
-
-    async init(options) {
-        Coon.userSettings = this;
-        if (Coon.util.typeOf(options) === 'array') {
-            this.moduleKeys = options;
-            options = {};
-        }
-        if (Coon.util.typeOf(options) === 'object') {
-            this.moduleKeys = options.keys || [];
-        }
-        this.storageType = options.storageType || 'browser';
-        if (this.storageType === 'service') {
-            this.storage = Ext.create('Coon.common.component.settings.stores.userSettingsStoreService');
-        }
-        this.defaultSettings = new Map();
-        this.setup = await this.restoreSetting() || this.defaultSettings;
-        this.prepareFields();
-        this.initDefaultSettings();
-    },
-
-    prepareFields() {
-        const me = this;
-        this.fields = [];
-        this.moduleKeys.forEach((key) => {
-            const settingModule = Ext.create(`usersetting.${key}`);
-            if (!settingModule) {
-                Coon.log.error(`[userSettings error], module with key: ${key} not found`);
-            }
-            this.settingHandlers.push(settingModule);
-            const {defaultValue} = settingModule;
-            if (!this.has(key)) {
-                this.set(key, defaultValue);
-            }
-            if (!Coon.util.typeEqual(defaultValue, this.get(key))) {
-                this.set(key, defaultValue);
-            }
-            if (typeof settingModule.init === 'function') {
-                settingModule.init(
-                    () => me.get(key)
-                );
-            }
-            this.fields.push(settingModule.getFieldComponent(
-                (prop) => me.getFieldValue(me, key, prop),
-                (prop, value) => me.setFieldValue(me, key, prop, value)
-            ));
-        });
-    },
-
-    getFieldValue(scope, key, prop) {
-        const config = scope.get(key);
-        if (prop && typeof prop === 'string' && Ext.isObject(config)) {
-            return config[prop];
-        } else {
-            return config;
-        }
-    },
-
-    setFieldValue(scope, key, prop, value) {
-        if (value === undefined) {
-            scope.set(key, prop);
-        } else {
-            const config = scope.get(key);
-            if (Ext.isObject(config)) {
-                config[prop] = value;
-                scope.set(key, config);
-            } else {
-                Coon.log.error('[Coon.userSettings error], setting value must be object for using "setProp" method!');
-            }
-        }
-    },
-
-    getFields() {
-        this.prepareFields();
-        return this.fields;
-    },
-
-    initDefaultSettings() {
-        this.defaultSettings = new Map();
-        this.settingHandlers
-            .forEach((el) => {
-                this.defaultSettings.set(el.key, el.defaultValue);
-            });
-    },
-
-    has(key) {
-        return this.setup.has(key);
-    },
-
-    get(key, defValue) {
-        return this.setup.get(key) || defValue;
-    },
-
-    getAll() {
-        const data = {};
-        for (const key of this.setup.keys()) {
-            data[key] = this.setup.get(key);
-        }
-        return data;
-    },
-
-    set(key, value) {
-        if (value === undefined) {
-            return;
-        }
-        this.setup.set(key, value);
-        this.saveAll();
-        if (this.storage) {
-            this.storage.set(key, value)
-                .catch((error) => {
-                    Coon.log.error('set userSettings error', error);
-                });
-        }
-    },
-
-    restoreSetting() {
-        if (this.storage) {
-            return this.storage.getAll()
-                .then((config) => {
-                    return Object.assign(
-                        this.getAllFromLocalStorage(),
-                        config || {}
-                    );
-                });
-        } else {
-            return this.getAllFromLocalStorage();
-        }
-    },
-
-    getAllFromLocalStorage() {
-        try {
-            const setup = JSON.parse(
-                localStorage.getItem('userSettings') || '{}'
-            );
-            return Promise.resolve(
-                new Map(Object.entries(setup))
-            );
-        } catch (ex) {
-            return Promise.resolve();
-        }
-    },
-
-    saveAll() {
-        localStorage.setItem(
-            'userSettings',
-            JSON.stringify(
-                this.getAll()
-            )
-        );
-    },
-
-});
+Ext.define('Coon.userSettings', {
+    singleton: true,
+
+    requires: [
+        'Coon.common.component.settings.modules.settingClosePageConfirmation',
+        'Coon.common.component.settings.modules.settingwindowHolder',
+        'Coon.common.component.settings.stores.userSettingsStoreService'
+    ],
+
+    settingHandlers: [],
+
+    async init(options) {
+        Coon.userSettings = this;
+        if (Coon.util.typeOf(options) === 'array') {
+            this.moduleKeys = options;
+            options = {};
+        }
+        if (Coon.util.typeOf(options) === 'object') {
+            this.moduleKeys = options.keys || [];
+        }
+        this.storageType = options.storageType || 'browser';
+        if (this.storageType === 'service') {
+            this.storage = Ext.create('Coon.common.component.settings.stores.userSettingsStoreService');
+        }
+        this.defaultSettings = new Map();
+        this.setup = await this.restoreSetting() || this.defaultSettings;
+        this.prepareFields();
+        this.initDefaultSettings();
+    },
+
+    prepareFields() {
+        const me = this;
+        this.fields = [];
+        this.moduleKeys.forEach((key) => {
+            const settingModule = Ext.create(`usersetting.${key}`);
+            if (!settingModule) {
+                Coon.log.error(`[userSettings error], module with key: ${key} not found`);
+            }
+            this.settingHandlers.push(settingModule);
+            const {defaultValue} = settingModule;
+            if (!this.has(key)) {
+                this.set(key, defaultValue);
+            }
+            if (!Coon.util.typeEqual(defaultValue, this.get(key))) {
+                this.set(key, defaultValue);
+            }
+            if (typeof settingModule.init === 'function') {
+                settingModule.init(
+                    () => me.get(key)
+                );
+            }
+            this.fields.push(settingModule.getFieldComponent(
+                (prop) => me.getFieldValue(me, key, prop),
+                (prop, value) => me.setFieldValue(me, key, prop, value)
+            ));
+        });
+    },
+
+    getFieldValue(scope, key, prop) {
+        const config = scope.get(key);
+        if (prop && typeof prop === 'string' && Ext.isObject(config)) {
+            return config[prop];
+        } else {
+            return config;
+        }
+    },
+
+    setFieldValue(scope, key, prop, value) {
+        if (value === undefined) {
+            scope.set(key, prop);
+        } else {
+            const config = scope.get(key);
+            if (Ext.isObject(config)) {
+                config[prop] = value;
+                scope.set(key, config);
+            } else {
+                Coon.log.error('[Coon.userSettings error], setting value must be object for using "setProp" method!');
+            }
+        }
+    },
+
+    getFields() {
+        this.prepareFields();
+        return this.fields;
+    },
+
+    initDefaultSettings() {
+        this.defaultSettings = new Map();
+        this.settingHandlers
+            .forEach((el) => {
+                this.defaultSettings.set(el.key, el.defaultValue);
+            });
+    },
+
+    has(key) {
+        return this.setup.has(key);
+    },
+
+    get(key, defValue) {
+        return this.setup.get(key) || defValue;
+    },
+
+    getAll() {
+        const data = {};
+        for (const key of this.setup.keys()) {
+            data[key] = this.setup.get(key);
+        }
+        return data;
+    },
+
+    set(key, value) {
+        if (value === undefined) {
+            return;
+        }
+        this.setup.set(key, value);
+        this.saveAll();
+        if (this.storage) {
+            this.storage.set(key, value)
+                .catch((error) => {
+                    Coon.log.error('set userSettings error', error);
+                });
+        }
+    },
+
+    restoreSetting() {
+        if (this.storage) {
+            return this.storage.getAll()
+                .then((config) => {
+                    return Object.assign(
+                        this.getAllFromLocalStorage(),
+                        config || {}
+                    );
+                });
+        } else {
+            return this.getAllFromLocalStorage();
+        }
+    },
+
+    getAllFromLocalStorage() {
+        try {
+            const setup = JSON.parse(
+                localStorage.getItem('userSettings') || '{}'
+            );
+            return Promise.resolve(
+                new Map(Object.entries(setup))
+            );
+        } catch (ex) {
+            return Promise.resolve();
+        }
+    },
+
+    saveAll() {
+        localStorage.setItem(
+            'userSettings',
+            JSON.stringify(
+                this.getAll()
+            )
+        );
+    },
+
+});

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.7.9',
+    number: '2.7.11',
 });

package/util/update.js

@@ -1,75 +1,75 @@
-const fs = require('fs');
-const path = require('path');
-const MarkdownIt = require('markdown-it');
-const converter = new MarkdownIt({
-    html: true,
-    linkify: true,
-    typographer: true,
-    breaks: true,
-});
-
-const {version: v} = require('../package.json');
-const filename = './src/version.js';
-const version = fs.readFileSync(filename, {encoding: 'utf8'}).split('\n');
-const idx = version.findIndex((el) => el.trim().includes('number:'));
-version[idx] = `    number: '${v}',`;
-fs.writeFileSync(filename, version.join('\n'));
-
-const getHtml = (md) => {
-    return converter.render(md);
-};
-
-const findParts = (lines, {start, end}) => {
-    return lines.reduce((acc, line) => {
-        if (!line) {
-            return acc;
-        }
-        if (!acc.startFound) {
-            if (line.includes(start)) {
-                acc.startFound = true;
-            } else {
-                acc.start += line + '\n';
-            }
-        } else {
-            if (acc.restFound) {
-                acc.rest += line + '\n';
-            } else {
-                if (line.includes(end)) {
-                    acc.restFound = true;
-                }
-            }
-        }
-        return acc;
-    }, {start: '', rest: ''});
-};
-
-const updateMdFile = (fileName, mdFileName) => {
-    const mdFile = fs.readFileSync(mdFileName, {encoding: 'utf8'});
-    const html = getHtml(mdFile);
-    const prop = {
-        name: `${path.parse(mdFileName).name.replace('-', '_').trim().toLowerCase()}HtmlInserted`,
-    };
-    prop.prop = prop.name + ':';
-    prop.start = `// ${prop.name}.start`;
-    prop.end = `// ${prop.name}.end`;
-    const file = fs.readFileSync(fileName, {encoding: 'utf8'});
-    const lines = file.split('\n');
-    const result = {};
-    if (lines.find((line) => line.includes(prop.start))) {
-        const {start, rest} = findParts(lines, prop);
-        result.start = start;
-        result.rest = rest;
-    } else {
-        result.parts = file.split('// insert_html_data_here');
-        result.start = result.parts[0] + '// insert_html_data_here\n';
-        result.rest = result.parts[1];
-    }
-    if (result.start && result.rest) {
-        fs.writeFileSync(fileName, result.start + `\t${prop.start}\n\t${prop.prop} \`${html}\`,\n\t${prop.end}\n` + result.rest);
-    } else {
-        throw new Error(`cant find ${prop.prop} in ${fileName}!`);
-    }
-};
-
-updateMdFile('./src/info.js', './doc/changelog.md');
-updateMdFile('./src/info.js', './doc/shortcuts.md');
+const fs = require('fs');
+const path = require('path');
+const MarkdownIt = require('markdown-it');
+const converter = new MarkdownIt({
+    html: true,
+    linkify: true,
+    typographer: true,
+    breaks: true,
+});
+
+const {version: v} = require('../package.json');
+const filename = './src/version.js';
+const version = fs.readFileSync(filename, {encoding: 'utf8'}).split('\n');
+const idx = version.findIndex((el) => el.trim().includes('number:'));
+version[idx] = `    number: '${v}',`;
+fs.writeFileSync(filename, version.join('\n'));
+
+const getHtml = (md) => {
+    return converter.render(md);
+};
+
+const findParts = (lines, {start, end}) => {
+    return lines.reduce((acc, line) => {
+        if (!line) {
+            return acc;
+        }
+        if (!acc.startFound) {
+            if (line.includes(start)) {
+                acc.startFound = true;
+            } else {
+                acc.start += line + '\n';
+            }
+        } else {
+            if (acc.restFound) {
+                acc.rest += line + '\n';
+            } else {
+                if (line.includes(end)) {
+                    acc.restFound = true;
+                }
+            }
+        }
+        return acc;
+    }, {start: '', rest: ''});
+};
+
+const updateMdFile = (fileName, mdFileName) => {
+    const mdFile = fs.readFileSync(mdFileName, {encoding: 'utf8'});
+    const html = getHtml(mdFile);
+    const prop = {
+        name: `${path.parse(mdFileName).name.replace('-', '_').trim().toLowerCase()}HtmlInserted`,
+    };
+    prop.prop = prop.name + ':';
+    prop.start = `// ${prop.name}.start`;
+    prop.end = `// ${prop.name}.end`;
+    const file = fs.readFileSync(fileName, {encoding: 'utf8'});
+    const lines = file.split('\n');
+    const result = {};
+    if (lines.find((line) => line.includes(prop.start))) {
+        const {start, rest} = findParts(lines, prop);
+        result.start = start;
+        result.rest = rest;
+    } else {
+        result.parts = file.split('// insert_html_data_here');
+        result.start = result.parts[0] + '// insert_html_data_here\n';
+        result.rest = result.parts[1];
+    }
+    if (result.start && result.rest) {
+        fs.writeFileSync(fileName, result.start + `\t${prop.start}\n\t${prop.prop} \`${html}\`,\n\t${prop.end}\n` + result.rest);
+    } else {
+        throw new Error(`cant find ${prop.prop} in ${fileName}!`);
+    }
+};
+
+updateMdFile('./src/info.js', './doc/changelog.md');
+updateMdFile('./src/info.js', './doc/shortcuts.md');