Skip to content

Fixed Empty Value When Using Conditional Select (#337). #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ab-tools wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed Empty Value When Using Conditional Select (#337). #508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 18 additions & 11 deletions js/ppom-conditions-v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ jQuery(function($) {
if ($(field).closest('div.ppom-field-wrapper').hasClass('ppom-c-hide')) return;

const data_name = $(field).data('data_name');
ppom_check_conditions(data_name, function(element_dataname, event_type) {
ppom_check_conditions(data_name, function(element_dataname, event_type, was_hidden) {
// console.log(data_name, event_type);
$.event.trigger({
type: event_type,
field: element_dataname,
was_hidden: was_hidden,
time: new Date()
});
});
Expand All @@ -29,10 +30,11 @@ jQuery(function($) {
$('form.cart').find('div.ppom-c-show').each(function(i, field) {

const data_name = $(field).data('data_name');
ppom_check_conditions(data_name, function(element_dataname, event_type) {
ppom_check_conditions(data_name, function(element_dataname, event_type, was_hidden) {
$.event.trigger({
type: event_type,
field: element_dataname,
was_hidden: was_hidden,
time: new Date()
});
});
Expand Down Expand Up @@ -60,10 +62,11 @@ jQuery(function($) {
}

const data_name = modifiedElement.dataset?.data_name;
ppom_check_conditions(data_name, (element_dataname, event_type) => {
ppom_check_conditions(data_name, (element_dataname, event_type, was_hidden) => {
$.event.trigger({
type: event_type,
field: element_dataname,
was_hidden: was_hidden,
time: new Date()
});
});
Expand Down Expand Up @@ -170,11 +173,12 @@ jQuery(function($) {
time: new Date()
});

ppom_check_conditions(e.field, function(element_dataname, event_type) {
ppom_check_conditions(e.field, function(element_dataname, event_type, was_hidden) {
// console.log(`${element_dataname} ===> ${event_type}`);
$.event.trigger({
type: event_type,
field: element_dataname,
was_hidden: was_hidden,
time: new Date()
});
});
Expand All @@ -191,13 +195,16 @@ jQuery(function($) {
ppom_fields_hidden_conditionally();

// Set checked/selected again
ppom_set_default_option(e.field);
if (e.was_hidden) {
ppom_set_default_option(e.field);
}

ppom_check_conditions(e.field, function(element_dataname, event_type) {
ppom_check_conditions(e.field, function(element_dataname, event_type, was_hidden) {
// console.log(`${element_dataname} ===> ${event_type}`);
$.event.trigger({
type: event_type,
field: element_dataname,
was_hidden: was_hidden,
time: new Date()
});
});
Expand Down Expand Up @@ -318,6 +325,8 @@ function ppom_check_conditions(data_name, callback) {
event_type = visibility === 'hide' ? 'ppom_field_hidden' : 'ppom_field_shown';
// console.log(`${t} ***** ${element_data_name} total_cond ${total_cond} == matched ${matched} ==> ${matched_conditions[element_data_name]} ==> visibility ${event_type}`);

const was_hidden = jQuery(this).hasClass('ppom-c-hide');

if ( (matched_conditions[element_data_name] > 0 && binding === 'Any') ||
(matched_conditions[element_data_name] == total_cond && binding === 'All')
) {
Expand All @@ -332,7 +341,7 @@ function ppom_check_conditions(data_name, callback) {
});

if ( typeof callback == "function" ) {
callback(element_data_name, event_type);
callback(element_data_name, event_type, was_hidden);
}
}
else if ( ! is_matched || matched_conditions[element_data_name] !== total_cond) {
Expand All @@ -346,7 +355,7 @@ function ppom_check_conditions(data_name, callback) {
}

if ( typeof callback == "function" )
callback(element_data_name, event_type);
callback(element_data_name, event_type, was_hidden);
} else {

jQuery(this).removeClass(`ppom-locked-${data_name} ppom-c-hide`);
Expand Down Expand Up @@ -535,9 +544,7 @@ function ppom_set_default_option(field_id) {
break;

case 'select':
if ( '' === jQuery("#" + field.data_name).val() ) {
jQuery("#" + field.data_name).val(field.selected);
}
jQuery("#" + field.data_name).val(field.selected);
break;

case 'image':
Expand Down