Skip to content
Open
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
2 changes: 1 addition & 1 deletion css/admin/frm-settings-components.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/frm_admin.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/frm_testing_mode.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/addons-page.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/addons-page.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/form-templates.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/form-templates.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable-settings-components.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable-settings-components.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_admin.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_blocks.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_blocks.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_dashboard.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_dashboard.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_overlay.js

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

2 changes: 1 addition & 1 deletion js/formidable_overlay.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_styles.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_styles.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/frm_testing_mode.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/onboarding-wizard.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/onboarding-wizard.js.map

Large diffs are not rendered by default.

37 changes: 33 additions & 4 deletions js/src/admin/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,7 @@
layoutClassesInput.value = layoutClassesInput.value.concat( ' frm_first' );
}

jQuery( layoutClassesInput ).trigger( 'change' );
jQuery( layoutClassesInput ).trigger( 'change', [ false ] );
};
}

Expand Down Expand Up @@ -3254,7 +3254,7 @@
return '';
}

function liveChanges() {
function liveChanges( event, shouldTryBreakFieldGroup = true ) {
/*jshint validthis:true */
let option,
newValue = this.value,
Expand All @@ -3275,7 +3275,7 @@
addBlankSelectOption( changes, newValue );
}
} else if ( att === 'class' ) {
changeFieldClass( changes, this );
changeFieldClass( changes, this, shouldTryBreakFieldGroup );
} else if ( isSliderField( changes ) ) {
updateSliderFieldPreview( changes, att, newValue );
} else {
Expand Down Expand Up @@ -6760,7 +6760,7 @@
}

/* Change the classes in the builder */
function changeFieldClass( field, setting ) {
function changeFieldClass( field, setting, shouldTryBreakFieldGroup ) {
let classes, replace, alignField,
replaceWith = ' ' + setting.value,
fieldId = field.getAttribute( 'data-fid' );
Expand Down Expand Up @@ -6795,9 +6795,38 @@
replaceWith = replaceWith.trim();
}

maybeBreakFieldGroup( !! shouldTryBreakFieldGroup, field, classes, replaceWith );

field.className = field.className.replace( replace, replaceWith );
}

/**

Check warning on line 6803 in js/src/admin/admin.js

View workflow job for this annotation

GitHub Actions / Run ESLint

Expected JSDoc block lines to be aligned
* @param {Boolean} shouldTryBreakFieldGroup
* @param {HTMLElement} field
* @param {String} classes
* @param {String} replaceWith
*
* @return {void}
*/
function maybeBreakFieldGroup( shouldTryBreakFieldGroup, field, classes, replaceWith ) {
if ( ! shouldTryBreakFieldGroup || ! replaceWith.includes( 'frm_first' ) || classes.includes( 'frm_first' ) ) {
return;
}

const fieldsInFieldGroup = Array.from( field.parentElement.children );
const indexOfTargetField = fieldsInFieldGroup.indexOf( field );
const fieldGroup = field.parentElement.closest( 'li.frm_field_box.ui-draggable' );

const newFieldGroup = fieldGroup.cloneNode( true );
fieldsInFieldGroup.slice( indexOfTargetField ).map( field => field.remove() );
fieldGroup.after( newFieldGroup );
const fieldsInNewFieldGroup = Array.from( newFieldGroup.firstChild.children );
fieldsInNewFieldGroup.slice( 0, indexOfTargetField ).map( field => field.remove() );

makeDroppable( newFieldGroup.querySelector( 'ul.frm_sorting' ) );
newFieldGroup.querySelectorAll( '.form-field' ).forEach( field => makeDraggable( field, '.frm-move' ) );
}

function maybeShowInlineModal( e ) {
/*jshint validthis:true */
e.preventDefault();
Expand Down
2 changes: 1 addition & 1 deletion js/welcome-tour.js

Large diffs are not rendered by default.