Skip to content

Commit 5ce1fb5

Browse files
committed
Merge branch 'develop'
2 parents 2867376 + 284df64 commit 5ce1fb5

File tree

303 files changed

+21364
-15707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+21364
-15707
lines changed

.eslintrc.js renamed to .eslintrc.cjs

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,69 @@ module.exports = {
22
root: true,
33
env: {
44
browser: true,
5+
es2021: true,
56
node: true
67
},
7-
parserOptions: {
8-
parser: 'babel-eslint',
9-
ecmaVersion: 2017,
10-
sourceType: 'module'
11-
},
128
extends: [
139
'eslint:recommended'
1410
],
11+
parserOptions: {
12+
parser: '@babel/eslint-parser',
13+
ecmaVersion: 'latest',
14+
sourceType: 'module'
15+
},
1516
rules: {
1617
'array-bracket-newline': ['error', 'consistent'],
1718
'array-bracket-spacing': ['error', 'never'],
19+
'array-element-newline': 'off',
1820
'arrow-parens': ['error', 'as-needed'],
1921
'arrow-spacing': ['error', { after: true, before: true }],
2022
'block-spacing': 'error',
23+
'brace-style': ['error', '1tbs'],
2124
camelcase: 'off',
2225
'comma-dangle': ['error', 'never'],
2326
'comma-spacing': ['error', { after: true, before: false }],
27+
'comma-style': 'off',
28+
'computed-property-spacing': ['error', 'never'],
2429
'default-case': 'error',
2530
'dot-location': ['error', 'property'],
2631
'eol-last': ['error', 'always'],
2732
eqeqeq: 'error',
33+
'func-call-spacing': ['error', 'never'],
2834
'guard-for-in': 'warn',
29-
indent: ['error',
30-
2,
31-
{
32-
ArrayExpression: 1,
33-
CallExpression: { arguments: 1 },
34-
FunctionDeclaration: { parameters: 'first' },
35-
ImportDeclaration: 'first',
36-
MemberExpression: 1,
37-
ObjectExpression: 1,
38-
SwitchCase: 1
39-
}],
35+
indent: ['error', 2, {
36+
ArrayExpression: 1,
37+
CallExpression: { arguments: 1 },
38+
FunctionDeclaration: { parameters: 'first' },
39+
ImportDeclaration: 'first',
40+
MemberExpression: 1,
41+
ObjectExpression: 1,
42+
SwitchCase: 1
43+
}],
4044
'jsdoc/require-jsdoc': 0,
4145
'key-spacing': ['error', { afterColon: true, beforeColon: false, mode: 'strict' }],
4246
'keyword-spacing': ['error', { after: true, before: true }],
4347
'linebreak-style': 'off',
48+
'line-comment-position': 'off',
49+
'lines-around-comment': 'off',
4450
'lines-between-class-members': ['error', 'always'],
51+
'max-len': 'off',
52+
'max-statements-per-line': ['error', { max: 1 }],
53+
'multiline-ternary': 'off',
4554
'no-alert': 'error',
55+
'no-async-promise-executor': 'off',
4656
'no-case-declarations': 'off',
4757
'no-console': ['warn', { allow: ['warn', 'error', 'trace'] }],
4858
'no-duplicate-imports': 'error',
4959
'no-else-return': ['error', { allowElseIf: false }],
60+
'no-extra-parens': 'error',
5061
'no-lonely-if': 'error',
62+
'no-mixed-spaces-and-tabs': 'error',
5163
'no-multi-spaces': 'error',
5264
'no-multi-str': 'error',
5365
'no-multiple-empty-lines': 'error',
5466
'no-new-func': 'error',
67+
'no-param-reassign': 'off',
5568
'no-prototype-builtins': 'off',
5669
'no-return-assign': 'error',
5770
'no-return-await': 'error',
@@ -65,6 +78,7 @@ module.exports = {
6578
'no-useless-constructor': 'warn',
6679
'no-var': 'error',
6780
'no-void': 'error',
81+
'no-whitespace-before-property': 'error',
6882
'object-curly-spacing': ['error', 'always'],
6983
'object-shorthand': 'error',
7084
'one-var': ['error', 'never'],
@@ -87,14 +101,14 @@ module.exports = {
87101
'sort-imports': 'off',
88102
'space-before-blocks': ['error', { classes: 'always', functions: 'always', keywords: 'always' }],
89103
'space-before-function-paren': ['error', 'always'],
90-
'space-in-parens': [2, 'never'],
104+
'space-in-parens': ['error', 'never'],
91105
'space-infix-ops': 'error',
92106
'spaced-comment': ['error', 'always'],
93-
'switch-colon-spacing': 'error'
107+
'switch-colon-spacing': 'error',
108+
'template-curly-spacing': ['error', 'never']
94109
},
95110
globals: {
96111
$: true,
97-
jQuery: true,
98-
adsbygoogle: true
112+
jQuery: true
99113
}
100114
}

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
ChangeLog
22
---------
33

4+
### 1.21.3
5+
6+
#### Core
7+
8+
- **New:** Added `escapeTitle` table option.
9+
- **New:** Added Aria Label to the search input for screenreaders.
10+
- **New:** Persist data attributes for the header(`th`).
11+
- **Update:** Fixed wrong condition for searching with server-side pagination.
12+
- **Update:** Fixed overwriting the `filterOptions` after rebuild.
13+
- **Update:** Fixed apostrophe issue when table via `html`.
14+
- **Update:** Updated extend util instead of `$.extend`.
15+
- **Update:** Updated Constructor.EVENTS to events.
16+
- **Update:** Updated packages to the latest version.
17+
18+
#### Extensions
19+
20+
- **Update(cookie):** Fixed issue with hidden and radio/checkbox columns.
21+
- **Update(export):** Fixed `exportTypes` option not working bug.
22+
- **Update(filter-control):** Fixed selector scope issues with multiple tables.
23+
- **Update(filter-control):** Fixed filtering values issue of select with `html` value.
24+
- **Update(reorder-columns):** Fixed same internal function name with `reorder-rows`.
25+
- **Update(treegrid):** Fixed `treegrid` not working when id is text.
26+
427
### 1.21.2
528

629
#### Core

cypress.config.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { defineConfig } from 'cypress'
2+
import plugins from './cypress/plugins/index.js'
3+
4+
export default defineConfig({
5+
video: false,
6+
screenshot: false,
7+
e2e: {
8+
// We've imported your old cypress plugins here.
9+
// You may want to clean this up later by importing these.
10+
setupNodeEvents(on, config) {
11+
return plugins(on, config)
12+
},
13+
},
14+
})

cypress.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)