diff --git a/.eslintrc.yml b/.eslintrc.yml index 018fb71a..c91f27e4 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -38,10 +38,26 @@ rules: prefer-const: warn no-var: error eqeqeq: error + block-spacing: error + brace-style: + - error + - 1tbs + - allowSingleLine: true + comma-spacing: error indent: - error - 4 - SwitchCase: 1 + key-spacing: + - error + - mode: minimum + keyword-spacing: error + space-before-blocks: error + space-infix-ops: error + no-unused-expressions: + - error + - allowShortCircuit: true + allowTernary: true vue/html-closing-bracket-newline: - error - singleline: never diff --git a/resources/assets/src/js/i18n.js b/resources/assets/src/js/i18n.js index ecddee66..b41b1afc 100644 --- a/resources/assets/src/js/i18n.js +++ b/resources/assets/src/js/i18n.js @@ -21,7 +21,7 @@ export function trans(key, parameters = {}) { for (const i in parameters) { if (parameters[i] !== undefined) { - temp = temp.replace(':'+i, parameters[i]); + temp = temp.replace(':' + i, parameters[i]); } } diff --git a/resources/assets/src/js/utils.js b/resources/assets/src/js/utils.js index 37b3f23f..77600737 100644 --- a/resources/assets/src/js/utils.js +++ b/resources/assets/src/js/utils.js @@ -18,9 +18,9 @@ export function debounce(func, delay) { * @return {string} */ export function queryString(key, defaultValue) { - const result = location.search.match(new RegExp('[?&]'+key+'=([^&]+)', 'i')); + const result = location.search.match(new RegExp('[?&]' + key + '=([^&]+)', 'i')); - if (result === null || result.length < 1){ + if (result === null || result.length < 1) { return defaultValue; } else { return result[1];