Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extends @wordpress/browserslist-config
16 changes: 11 additions & 5 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# Exclude auto generated files.
**/*.min.js
**/*.js.map
**/formidable_blocks.js
**/formidable_overlay.js
**/formidable_dashboard.js
**/formidable-templates.js
**/formidable_styles.js
js/formidable_blocks.js
js/formidable_overlay.js
js/form-templates.js
js/formidable_dashboard.js
js/onboarding-wizard.js
js/addons-page.js
js/formidable_styles.js
js/formidable_admin.js
js/bootstrap-multiselect.js

# Config files
*.config.js

**/node_modules/**
**/vendor/**
Expand Down
26 changes: 23 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"settings": {
"import/resolver": {
"webpack": {
"config": "webpack.config.js"
"config": "./webpack.config.js"
}
},
"react": {
Expand All @@ -48,7 +48,24 @@
"rules": {
"cypress/unsafe-to-chain-command": "off",
"cypress/no-assigning-return-values": "off",
"camelcase": ["error", { "properties": "never" }],
"camelcase": [
"error",
{
"properties": "never",
"allow": [
"frm_admin_js",
"frm_stripe_vars",
"frm_trans_vars",
"formidable_form_selector",
"frm_js",
"frm_password_checks",
"formidable_block_calculator",
"formidable_view_selector",
"frmdates_admin_js",
"frm_abdn"
]
}
],
"lines-around-comment": "off",
"react/display-name": "off",
"react/jsx-curly-spacing": [
Expand Down Expand Up @@ -128,6 +145,9 @@
"no-jquery/no-trim": "error",
"no-jquery/no-type": "error",
"no-jquery/no-unique": "error",
"no-jquery/no-when": "error"
"no-jquery/no-when": "error",
"react/jsx-no-target-blank": "off",
"comma-dangle": "off",
"arrow-parens": ["error", "as-needed"]
}
}
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
node-version: 20

- name: Install dependencies
run: npm ci --include=dev
run: npm ci --legacy-peer-deps --include=dev

- name: Set up WP environment
run: npm run env start
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/jscs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,18 @@ on:
branches:
- master
pull_request:
branches:
- master
types: [ opened, labeled, synchronize ]

name: Inspections
jobs:
runPHPCSInspection:
if: contains(github.event.pull_request.labels.*.name, 'run analysis')
name: Run ESLint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- name: Analyze js code style
run: |
npm install eslint
wget https://develop.svn.wordpress.org/trunk/.jshintrc
./node_modules/.bin/eslint ./js/formidable.js
./node_modules/.bin/eslint ./tests/cypress/e2e/*
./node_modules/.bin/eslint ./js/src/admin/admin.js
npm ci --legacy-peer-deps --include=dev
./node_modules/.bin/eslint .
2 changes: 1 addition & 1 deletion js/addons-page.js

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions js/admin/addons.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@
*/

wp.domReady( () => {

/**
* Internal dependencies
*/
const { toggleAddonState } = window.frmAdminBuild;

document.addEventListener( 'click', ( event ) => {
document.addEventListener( 'click', event => {
if ( event.target.matches( '.frm-uninstall-addon' ) ) {
event.preventDefault();
toggleAddonState( event.target, 'frm_uninstall_addon' );
} else if ( event.target.matches( '.frm-deactivate-addon' ) ) {
event.preventDefault();
toggleAddonState( event.target, 'frm_deactivate_addon' );
}
});
});
} );
} );
Loading
Loading