Skip to content

Commit

Permalink
Merge branch 'nav' into feature/nav-import-existing
Browse files Browse the repository at this point in the history
  • Loading branch information
oakesjosh committed Jul 26, 2024
2 parents cab9083 + 4365e3d commit 37c7a02
Show file tree
Hide file tree
Showing 137 changed files with 7,793 additions and 4,058 deletions.
67 changes: 56 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,50 @@ const eslintConfig = {
},
globals: {
kt_blocks_params: 'readonly',
kadence_blocks_params: 'writeable',
kadence_blocks_params: 'writable',
kt_deregister_params: 'readonly',
kadence_blocks_user_params: 'readonly',
kadence_blocks_parallax: 'readonly',
kadence_blocks_form_params: 'readonly',
form_data: 'readonly',
grecaptcha: 'readonly',
kb_adv_form_params: 'readonly',
kadence_video_pop: 'readonly',
kadenceExtensionImagePicker: 'readonly',
kt_blocks_default_size: 'readonly',
kb_glightbox: 'readonly',
AOS: 'readonly',
kadenceHomeParams: 'readonly',
jarallax: 'readonly',
jQuery: 'readonly',
sessionStorage: 'writable',
localStorage: 'writable',
FormData: 'readonly',
location: 'readonly',
FileReader: 'readonly',
Headers: 'readonly',
pagenow: 'readonly',
ENTER: 'readonly',
Splide: 'readonly',
MouseEvent: 'readonly',
countUp: 'readonly',
CustomEvent: 'readonly',
DOMParser: 'readonly',
KadenceAccordion: 'readonly',
Gumshoe: 'readonly',
HTMLElement: 'readonly',
XMLHttpRequest: 'readonly',
Typed: 'readonly',
define: 'readonly',
history: 'writable',
filteredBlockPatterns: 'readable',
onSelectBlockPattern: 'readable',
blockCode: 'readable',
scrollTo: 'readable',
Image: 'readable',
Masonry: 'readable',
IntersectionObserver: 'readable',
getComputedStyle: 'readable',
},
rules: {
'@wordpress/i18n-text-domain': [
Expand All @@ -25,22 +66,23 @@ const eslintConfig = {
allowedTextDomain: ['default', 'kadence-blocks', 'kadence-starter-templates'],
},
],
'import/no-unresolved': [
'error',
{
ignore: ['@kadence/icons', '@kadence/components', '@kadence/helpers', '@wordpress/*'],
},
],
'import/no-extraneous-dependencies': 'off',
'import/no-unresolved': 'off',
'import/named': 'off',
'no-unused-vars': 'off',
'react-hooks/exhaustive-deps': 'off',
'no-shadow': 'off',
'@wordpress/i18n-ellipsis': 'off',
'jsdoc/require-param': 'off',
'no-nested-ternary': 'off',
camelcase: 'off',
'no-undef': 'off',
'@wordpress/no-unsafe-wp-apis': 'off',
'react-hooks/rules-of-hooks': 'off',
'no-console': 'off',
'react/jsx-no-target-blank': 'off',
'no-var': 'off',
'array-callback-return': 'off',
'jsdoc/check-types': 'off',
'jsdoc/check-tag-names': 'off',
Expand All @@ -49,10 +91,7 @@ const eslintConfig = {
eqeqeq: 'off',
'no-unused-expressions': 'off',
'jsx-a11y/no-autofocus': 'off',
'@wordpress/i18n-translator-comments': 'off',
'jsdoc/check-line-alignment': 'off',
'no-useless-computed-key': 'off',
'@wordpress/no-unused-vars-before-return': 'off',
'react/no-unknown-property': 'off',
'react/jsx-key': 'off',
'jsdoc/check-param-names': 'off',
Expand All @@ -64,15 +103,21 @@ const eslintConfig = {
'jsx-a11y/no-static-element-interactions': 'off',
'jsx-a11y/aria-role': 'off',
'jsdoc/require-param-type': 'off',
'jsx-a11y/anchor-is-valid': 'off',
'no-redeclare': 'off',
'import/default': 'off',
'@wordpress/i18n-no-collapsible-whitespace': 'off',
'jsx-a11y/alt-text': 'off',
'no-bitwise': 'off',
'jsdoc/require-returns-check': 'off',
'@wordpress/no-global-active-element': 'off',
},
overrides: [
{
files: ['src/assets/js/**'],
rules: {
'no-var': 'off',
},
},
],
ignorePatterns: [],
};

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
slack_channel: ${{ needs.set_vars.outputs.slack_channel }}
slack_thread: ${{ needs.set_vars.outputs.slack_thread }}
secrets:
COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }}
COMPOSER_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
GH_BOT_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
JENKINS_SECRET: ${{ secrets.ZIP_JENKINS_SECRET }}
S3_BUCKET: ${{ secrets.ZIP_S3_BUCKET }}
Expand Down
2 changes: 1 addition & 1 deletion includes/advanced-form/advanced-form-captcha-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ private function is_using_kadence_captcha_settings( $attributes ) {
}

private function is_using_kadence_blocks_settings( $attributes ) {
if ( isset( $attributes['useKbSettings'] ) && $attributes['useKbSettings'] ) {
if ( !isset( $attributes['useKbSettings'] ) || ( isset( $attributes['useKbSettings'] ) && $attributes['useKbSettings'] ) ) {
$this->using_kadence_blocks_settings = true;
} else {
$this->using_kadence_blocks_settings = false;
Expand Down
2 changes: 1 addition & 1 deletion includes/assets/js/gumshoe.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 37c7a02

Please sign in to comment.