Skip to content

Commit

Permalink
Merge branch 'master' into feat/ai-page-wizard
Browse files Browse the repository at this point in the history
  • Loading branch information
kadencewp committed Aug 1, 2024
2 parents d11720c + 83dd22f commit c528f3b
Show file tree
Hide file tree
Showing 44 changed files with 772 additions and 435 deletions.
44 changes: 42 additions & 2 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 @@ -35,7 +76,6 @@ const eslintConfig = {
'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',
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
matrix:
wordpress:
- latest
- '6.4.3'
- '6.3.3'
- '6.5.5'
- '6.4.5'
php:
- '7.4'
- '8.0'
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
1 change: 1 addition & 0 deletions includes/advanced-form/advanced-form-cpt.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ public function register_post_type() {
'parent_item_colon' => __( 'Parent Form:', 'kadence-blocks' ),
'all_items' => __( 'Forms', 'kadence-blocks' ),
'add_new_item' => __( 'Add New Form', 'kadence-blocks' ),
'add_new' => __( 'Add New Form', 'kadence-blocks' ),
'new_item' => __( 'New Form', 'kadence-blocks' ),
'edit_item' => __( 'Edit Form', 'kadence-blocks' ),
'update_item' => __( 'Update Form', 'kadence-blocks' ),
Expand Down
2 changes: 1 addition & 1 deletion includes/assets/js/kb-splide-init.min.js

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

Loading

0 comments on commit c528f3b

Please sign in to comment.