Skip to content

'Not selected' checkbox removed #1

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
arthurislamov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

'Not selected' checkbox removed #1

Show file tree
Hide file tree
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
69 changes: 42 additions & 27 deletions assets/js/sliderfield_element_sliderfield.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,25 @@
// See https://bugs.webkit.org/show_bug.cgi?id=23789
}
});
if (setting.display_ignore_button) {
$slider.parent().find('.sliderfield-ignore').change(function() {
var $slider = $(this).parent().parent().find('.sliderfield, .webform-sliderfield');
var $slider_container = $slider.find('.sliderfield-container');
$slider_id = $slider.attr('id');
var setting = drupalSettings['sliderfield_' + $slider_id];
if ($(this).is(':checked')) {
$(this).parent().parent().find('.sliderfield-value-field').val('');
$(this).parent().parent().find('.sliderfield-value2-field').val('');
if (setting.fields_to_sync_css_selector) {
$(setting.fields_to_sync_css_selector).val('');
}
$slider_container.slider( "disable" );
} else {
$slider_container.slider( "enable" );
}
});
}
if (setting.disabled || ($value == '' && setting.display_ignore_button)) {
// if (setting.display_ignore_button) {
// $slider.parent().find('.sliderfield-ignore').change(function() {
// var $slider = $(this).parent().parent().find('.sliderfield, .webform-sliderfield');
// var $slider_container = $slider.find('.sliderfield-container');
// $slider_id = $slider.attr('id');
// var setting = drupalSettings['sliderfield_' + $slider_id];
// if ($(this).is(':checked')) {
// $(this).parent().parent().find('.sliderfield-value-field').val('');
// $(this).parent().parent().find('.sliderfield-value2-field').val('');
// if (setting.fields_to_sync_css_selector) {
// $(setting.fields_to_sync_css_selector).val('');
// }
// $slider_container.slider( "disable" );
// } else {
// $slider_container.slider( "enable" );
// }
// });
// }
if (setting.disabled) {
$(this).slider( "disable" );
}

Expand Down Expand Up @@ -161,9 +161,9 @@
// Move slider without toggling events
$SliderField.slider({value: $value});

if (!setting.disabled && setting.display_ignore_button) {
$SliderField.slider( "enable" );
}
// if (!setting.disabled && setting.display_ignore_button) {
// $SliderField.slider( "enable" );
// }
}
});

Expand Down Expand Up @@ -202,9 +202,9 @@
// Move slider without toggling events
$SliderField.slider('values', 1, $value);

if (!setting.disabled && setting.display_ignore_button) {
$SliderField.slider( "enable" );
}
// if (!setting.disabled && setting.display_ignore_button) {
// $SliderField.slider( "enable" );
// }
}
});
}
Expand Down Expand Up @@ -249,9 +249,24 @@
}
$('#' + $slider_id + ' .ui-slider-handle:eq(' + i + ') .sliderfield-bubble').html(bubble_value);
}
$values[i] = setting.display_values_format.replace('%{value}%', $values[i]);

// Update values text
if (setting.display_values) {
$values[i] = setting.display_values_format.replace('%{value}%', $values[i]);
}
}

var $slider_label = $slider.find('.sliderfield-display-values-field');
if ($values.length > 1) {
$slider_label.html($values.join(' - '));
} else {
if(setting.min == $values[0]) {
$slider_label.html(setting.not_selected_text);
} else {
$slider_label.html($values.join(' - '));
}
}
$slider.find('.sliderfield-display-values-field').html($values.join(' - '));
// $slider.find('.sliderfield-display-values-field').html($values.join(' - '));
}

var sliderfieldsSlideChange = function(event, ui) {
Expand Down
40 changes: 13 additions & 27 deletions src/Element/Slider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
* '#display_inputs' => TRUE,
* '#display_values' => FALSE,
* '#display_values_format' => '%{value}%',
* '#not_selected_text' => 'Not selected'
* '#display_bubble' => FALSE,
* '#display_bubble_format' => '%{value}%',
* '#slider_length' => NULL,
Expand All @@ -89,7 +90,6 @@
* '#group_master' => FALSE,
* '#validate_range' => TRUE,
* '#fields_to_sync_css_selector' => NULL,
* '#display_ignore_button' => FALSE,
* '#hide_slider_handle_when_no_value' => FALSE,
* );
* @endcode
Expand Down Expand Up @@ -123,6 +123,7 @@ public function getInfo() {
'#display_inputs' => TRUE,
'#display_values' => FALSE,
'#display_values_format' => '%{value}%',
'#not_selected_text' => 'Not selected',
'#display_bubble' => FALSE,
'#display_bubble_format' => '%{value}%',
'#slider_length' => NULL,
Expand All @@ -132,7 +133,6 @@ public function getInfo() {
'#group_master' => FALSE,
'#validate_range' => TRUE,
'#fields_to_sync_css_selector' => NULL,
'#display_ignore_button' => FALSE,
'#hide_slider_handle_when_no_value' => FALSE,
'#process' => [
[$class, 'processAjaxForm'],
Expand Down Expand Up @@ -212,12 +212,12 @@ public static function preRenderSlider($element) {
if ($element['#display_inside_fieldset']) {
$element['slider'] = [
'#type' => 'fieldset',
'#title' => $element['#title']
'#title' => $element['#title'],
];
}
elseif ($element['#title']) {
$element['slider'] = [
'#type' => 'container'
'#type' => 'container',
];
}

Expand All @@ -241,20 +241,6 @@ public static function preRenderSlider($element) {
}
}

if ($element['#display_ignore_button'] && !$element['#display_inputs']) {
$element['slider']['ignore'] = [
'#type' => 'checkbox',
'#title' => t('Not Selected (Uncheck to select a value)'),
'#value' => (is_null($value) || $value === ''),
'#disabled' => $element['#disabled'],
'#attributes' => [
'class' => [
'slider-ignore'
]
]
];
}

$_attributes_new = [
'class' => [
'sliderfield-value-field',
Expand Down Expand Up @@ -290,7 +276,7 @@ public static function preRenderSlider($element) {
$value = NULL;
$ajax['trigger_as'] = array(
'name' => $element['#name'],
'value' => $value
'value' => $value,
);
}
if (!isset($ajax['event'])) {
Expand All @@ -310,7 +296,7 @@ public static function preRenderSlider($element) {
$values[$key] = str_replace('%{value}%', $value ,$element['#display_values_format']);
}
$element['slider']['values_text'] = [
'#markup' => '<div class="sliderfield-display-values-field">' . htmlentities(implode(' - ', $values)) . '</div>'
'#markup' => '<div class="sliderfield-display-values-field">' . htmlentities(implode(' - ', $values)) . '</div>',
];
}

Expand All @@ -326,7 +312,7 @@ public static function preRenderSlider($element) {
if ($element['#hide_slider_handle_when_no_value']) {
$element['slider']['note'] = array(
'#type' => 'markup',
'#markup' => '<div class="sliderfield-selectvalue-description">' . t('Please click on any part of the slider to select a value') . '</div>'
'#markup' => '<div class="sliderfield-selectvalue-description">' . t('Please click on any part of the slider to select a value') . '</div>',
);
}

Expand All @@ -336,13 +322,13 @@ public static function preRenderSlider($element) {
'#attributes' => [
'class' => [
'sliderfield-container',
$element['#slider_style']
$element['#slider_style'],
],
'style' => $style
'style' => $style,
],
'#attached' => [
'library' => [
'sliderfield/element.slider'
'sliderfield/element.slider',
],
'drupalSettings' => [
'sliderfield_' . $element['#id'] => [
Expand All @@ -357,20 +343,20 @@ public static function preRenderSlider($element) {
'step' => $element['#step'] * 1,
'display_inputs' => $element['#display_inputs'],
'display_values_format' => $element['#display_values_format'],
'not_selected_text' => $element['#not_selected_text'],
'display_bubble' => $element['#display_bubble'],
'display_bubble_format' => $element['#display_bubble_format'],
'display_values' => $element['#display_values'],
'group' => $element['#group'],
'group_type' => $element['#group_type'],
'group_master' => $element['#group_master'],
'fields_to_sync_css_selector' => $element['#fields_to_sync_css_selector'],
'display_ignore_button' => $element['#display_ignore_button'],
'hide_slider_handle_when_no_value' => $element['#hide_slider_handle_when_no_value']
'hide_slider_handle_when_no_value' => $element['#hide_slider_handle_when_no_value'],
]
]
],
'#markup' => '',
'#suffix' => '</div>'
'#suffix' => '</div>',
];

$element['#process_called'] = TRUE;
Expand Down
Loading