Changeset 2200584
- Timestamp:
- 11/25/2019 02:20:04 PM (6 years ago)
- Location:
- gravity-slider-fields
- Files:
-
- 12 edited
- 1 copied
-
tags/1.7 (copied) (copied from gravity-slider-fields/trunk)
-
tags/1.7/class-gf-field-slider.php (modified) (3 diffs)
-
tags/1.7/class-gfsliderfields.php (modified) (4 diffs)
-
tags/1.7/gravity-slider-fields.php (modified) (2 diffs)
-
tags/1.7/js/slider.js (modified) (2 diffs)
-
tags/1.7/js/slider.min.js (modified) (1 diff)
-
tags/1.7/readme.txt (modified) (2 diffs)
-
trunk/class-gf-field-slider.php (modified) (3 diffs)
-
trunk/class-gfsliderfields.php (modified) (4 diffs)
-
trunk/gravity-slider-fields.php (modified) (2 diffs)
-
trunk/js/slider.js (modified) (2 diffs)
-
trunk/js/slider.min.js (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
gravity-slider-fields/tags/1.7/class-gf-field-slider.php
r2187015 r2200584 24 24 'slider_value_relations', 25 25 'slider_step', 26 'slider_value_visibility' 26 'slider_value_visibility', 27 'slider_connect' 27 28 ); 28 29 } … … 163 164 $data_value_visibility = isset( $this->slider_value_visibility ) ? "data-value-visibility='{$this->slider_value_visibility}'" : "data-value-visibility='hidden'"; 164 165 166 $connects_attr = $this->slider_connect == "none" ? "data-connect=false" : "data-connect='{$this->slider_connect}'"; 167 165 168 if ( 'currency' == $this->numberFormat ) { 166 169 // get current gravity forms currency … … 178 181 } 179 182 180 return sprintf( "<div class='ginput_container'><input name='input_%d' id='%s' type='{$html_input_type}' {$step_attr} {$min_attr} {$max_attr} {$data_value_visibility} value='%s' class='%s' data-min-relation='%s' data-max-relation='%s' data-value-format='%s' {$currency} {$tabindex} {$read_only} {$placeholder_attribute} %s/><div id='gsfslider_%d' class='slider-display'></div>%s</div>", $id, $field_id, esc_attr( $value ), esc_attr( $class ), esc_attr( $this->slider_min_value_relation ), esc_attr( $this->slider_max_value_relation ), esc_attr( $this->numberFormat ), $disabled_text, $id, $instruction );183 return sprintf( "<div class='ginput_container'><input name='input_%d' id='%s' type='{$html_input_type}' {$step_attr} {$min_attr} {$max_attr} {$data_value_visibility} ${connects_attr} value='%s' class='%s' data-min-relation='%s' data-max-relation='%s' data-value-format='%s' {$currency} {$tabindex} {$read_only} {$placeholder_attribute} %s/><div id='gsfslider_%d' class='slider-display'></div>%s</div>", $id, $field_id, esc_attr( $value ), esc_attr( $class ), esc_attr( $this->slider_min_value_relation ), esc_attr( $this->slider_max_value_relation ), esc_attr( $this->numberFormat ), $disabled_text, $id, $instruction ); 181 184 182 185 } -
gravity-slider-fields/tags/1.7/class-gfsliderfields.php
r2073431 r2200584 58 58 __( 'Select whether to hide, show on hover & drag, or always show the currently selected value.', 'typewheel' ) 59 59 ) ); 60 $this->add_tooltip( 'slider_connect', sprintf( 61 '<h6>%s</h6> %s', 62 __( 'Connecting Elements', 'typewheel' ), 63 __( 'Select whether to visually connect the handle to the upper or lower edge of the slider.', 'typewheel' ) 64 ) ); 60 65 61 66 add_filter( 'gform_custom_merge_tags', array( $this, 'slider_calculation_merge_tags' ), 10, 4 ); … … 224 229 field.slider_step = 1; 225 230 field.slider_value_visibility = "hidden"; 231 field.slider_connect = "none"; 226 232 break; 227 233 <?php … … 244 250 jQuery("#slider_step").val(field['slider_step']); 245 251 jQuery("#slider_value_visibility").val(field['slider_value_visibility']); 252 jQuery("#slider_connect").val(field['slider_connect']); 246 253 }); 247 254 … … 290 297 </div> 291 298 </li> 299 <li class="slider_connect field_setting"> 300 <div style="clear:both;"> 301 <?php _e( 'Connect', 'gsf-locale' ); ?> 302 <?php gform_tooltip( 'slider_connect' ); ?> 303 </div> 304 <div style="width:25%;"> 305 <select id="slider_connect" onchange="SetFieldProperty('slider_connect', this.value);"> 306 <option value="none"><?php _e( 'None', 'gsf-locale' ); ?></option> 307 <option value="lower"><?php _e( 'Lower', 'gsf-locale' ); ?></option> 308 <option value="upper"><?php _e( 'Upper', 'gsf-locale' ); ?></option> 309 </select> 310 </div> 311 </li> 292 312 <?php 293 313 } -
gravity-slider-fields/tags/1.7/gravity-slider-fields.php
r2187015 r2200584 4 4 Plugin URI: https://wordpress.org/plugins/gravity-slider-fields/ 5 5 Description: Adds slider fields to Gravity Forms 6 Version: 1. 66 Version: 1.7 7 7 Author: Typewheel 8 8 Author URI: https://typewheel.xyz/ … … 26 26 */ 27 27 28 define( 'GF_SLIDER_FIELDS_VERSION', '1. 6' );28 define( 'GF_SLIDER_FIELDS_VERSION', '1.7' ); 29 29 30 30 add_action( 'gform_loaded', array( 'GF_Slider_Fields_Bootstrap', 'load' ), 5 ); -
gravity-slider-fields/tags/1.7/js/slider.js
r2073431 r2200584 28 28 var step = parseFloat(input.attr('step')); 29 29 var visibility = input.data('value-visibility'); 30 var connect = input.data('connect'); 30 31 var format = input.data('value-format'); 31 32 … … 85 86 decimals: decs, 86 87 }), 88 connect: connect, 87 89 tooltips: formatTooltip, 88 90 }); -
gravity-slider-fields/tags/1.7/js/slider.min.js
r2073431 r2200584 1 jQuery(document).ready(function( v){var a=function(){var h=function(a){return Math.floor(a)===a?0:a.toString().split(".")[1].length||0};v(".slider-display").each(function(a,e){if(!v(this).hasClass("slider-initialized")){var i=v(this),t=i.prev(":input"),r=t.val(),l=t.attr("id"),n=(t.attr("tabindex"),t.data("min-relation")),s=t.data("max-relation"),d=parseFloat(t.attr("min")),o=parseFloat(t.attr("max")),m=parseFloat(t.attr("step")),c=t.data("value-visibility"),u=t.data("value-format");if("currency"==u){(f=t.data("currency")).decimals<h(m)&&(0==f.decimals?m=1:1==f.decimals?m=.1:2==f.decimals&&(m=.01));var p=f.decimals}else p=h(m);if("hover-drag"==c||"show"==c)if("currency"==u)var f=t.data("currency"),g=wNumb({decimals:f.decimals,mark:f.decimal_separator,thousand:f.thousand_separator,prefix:f.symbol_left+f.symbol_padding,postfix:f.symbol_padding+f.symbol_right});else g="decimal_comma"==u?wNumb({decimals:h(m),mark:",",thousand:"."}):wNumb({decimals:h(m)});else g=!1;noUiSlider.create(e,{start:[r],step:m,range:{min:[d],max:[o]},format:wNumb({decimals:p}),tooltips:g}),i.addClass("slider-initialized"),e.noUiSlider.on("update",function(a){t.attr("value",a),v(".gfield .slider").trigger("change")}),document.getElementById(l).addEventListener("change",function(){e.noUiSlider.set(this.value)}),i.append('<span class="min-val-relation">'+n+'</span><span class="max-val-relation">'+s+"</span>")}})};jQuery(document).bind("gform_page_loaded",function(){v(".gfield .slider").length&&a()}),a()});1 jQuery(document).ready(function(y){function a(){function v(a){return Math.floor(a)===a?0:a.toString().split(".")[1].length||0}y(".slider-display").each(function(a,e){if(!y(this).hasClass("slider-initialized")){var i=y(this),t=i.prev(":input"),l=t.val(),n=t.attr("id"),s=(t.attr("tabindex"),t.data("min-relation")),r=t.data("max-relation"),d=parseFloat(t.attr("min")),o=parseFloat(t.attr("max")),c=parseFloat(t.attr("step")),m=t.data("value-visibility"),u=t.data("connect"),f=t.data("value-format");if("currency"==f){if((g=t.data("currency")).decimals<v(c))if(0==g.decimals)c=1;else if(1==g.decimals)c=.1;else if(2==g.decimals)c=.01;var p=g.decimals}else p=v(c);if("hover-drag"==m||"show"==m)if("currency"==f)var g=t.data("currency"),h=wNumb({decimals:g.decimals,mark:g.decimal_separator,thousand:g.thousand_separator,prefix:g.symbol_left+g.symbol_padding,postfix:g.symbol_padding+g.symbol_right});else if("decimal_comma"==f)h=wNumb({decimals:v(c),mark:",",thousand:"."});else h=wNumb({decimals:v(c)});else h=!1;noUiSlider.create(e,{start:[l],step:c,range:{min:[d],max:[o]},format:wNumb({decimals:p}),connect:u,tooltips:h}),i.addClass("slider-initialized"),e.noUiSlider.on("update",function(a){t.attr("value",a),y(".gfield .slider").trigger("change")}),document.getElementById(n).addEventListener("change",function(){e.noUiSlider.set(this.value)}),i.append('<span class="min-val-relation">'+s+'</span><span class="max-val-relation">'+r+"</span>")}})}jQuery(document).bind("gform_page_loaded",function(){y(".gfield .slider").length&&a()}),a()}); -
gravity-slider-fields/tags/1.7/readme.txt
r2187015 r2200584 7 7 Requires PHP: 5.6 8 8 Tested up to: 5.3 9 Stable tag: 1. 69 Stable tag: 1.7 10 10 License: GPLv2 or later 11 11 … … 65 65 == Changelog == 66 66 67 = 1.7 = 68 * Allow connecting handle to lower or upper edge 69 67 70 = 1.6 = 68 71 * Remove call to deprecated GF_Field::get_conditional_logic_event -
gravity-slider-fields/trunk/class-gf-field-slider.php
r2187015 r2200584 24 24 'slider_value_relations', 25 25 'slider_step', 26 'slider_value_visibility' 26 'slider_value_visibility', 27 'slider_connect' 27 28 ); 28 29 } … … 163 164 $data_value_visibility = isset( $this->slider_value_visibility ) ? "data-value-visibility='{$this->slider_value_visibility}'" : "data-value-visibility='hidden'"; 164 165 166 $connects_attr = $this->slider_connect == "none" ? "data-connect=false" : "data-connect='{$this->slider_connect}'"; 167 165 168 if ( 'currency' == $this->numberFormat ) { 166 169 // get current gravity forms currency … … 178 181 } 179 182 180 return sprintf( "<div class='ginput_container'><input name='input_%d' id='%s' type='{$html_input_type}' {$step_attr} {$min_attr} {$max_attr} {$data_value_visibility} value='%s' class='%s' data-min-relation='%s' data-max-relation='%s' data-value-format='%s' {$currency} {$tabindex} {$read_only} {$placeholder_attribute} %s/><div id='gsfslider_%d' class='slider-display'></div>%s</div>", $id, $field_id, esc_attr( $value ), esc_attr( $class ), esc_attr( $this->slider_min_value_relation ), esc_attr( $this->slider_max_value_relation ), esc_attr( $this->numberFormat ), $disabled_text, $id, $instruction );183 return sprintf( "<div class='ginput_container'><input name='input_%d' id='%s' type='{$html_input_type}' {$step_attr} {$min_attr} {$max_attr} {$data_value_visibility} ${connects_attr} value='%s' class='%s' data-min-relation='%s' data-max-relation='%s' data-value-format='%s' {$currency} {$tabindex} {$read_only} {$placeholder_attribute} %s/><div id='gsfslider_%d' class='slider-display'></div>%s</div>", $id, $field_id, esc_attr( $value ), esc_attr( $class ), esc_attr( $this->slider_min_value_relation ), esc_attr( $this->slider_max_value_relation ), esc_attr( $this->numberFormat ), $disabled_text, $id, $instruction ); 181 184 182 185 } -
gravity-slider-fields/trunk/class-gfsliderfields.php
r2073431 r2200584 58 58 __( 'Select whether to hide, show on hover & drag, or always show the currently selected value.', 'typewheel' ) 59 59 ) ); 60 $this->add_tooltip( 'slider_connect', sprintf( 61 '<h6>%s</h6> %s', 62 __( 'Connecting Elements', 'typewheel' ), 63 __( 'Select whether to visually connect the handle to the upper or lower edge of the slider.', 'typewheel' ) 64 ) ); 60 65 61 66 add_filter( 'gform_custom_merge_tags', array( $this, 'slider_calculation_merge_tags' ), 10, 4 ); … … 224 229 field.slider_step = 1; 225 230 field.slider_value_visibility = "hidden"; 231 field.slider_connect = "none"; 226 232 break; 227 233 <?php … … 244 250 jQuery("#slider_step").val(field['slider_step']); 245 251 jQuery("#slider_value_visibility").val(field['slider_value_visibility']); 252 jQuery("#slider_connect").val(field['slider_connect']); 246 253 }); 247 254 … … 290 297 </div> 291 298 </li> 299 <li class="slider_connect field_setting"> 300 <div style="clear:both;"> 301 <?php _e( 'Connect', 'gsf-locale' ); ?> 302 <?php gform_tooltip( 'slider_connect' ); ?> 303 </div> 304 <div style="width:25%;"> 305 <select id="slider_connect" onchange="SetFieldProperty('slider_connect', this.value);"> 306 <option value="none"><?php _e( 'None', 'gsf-locale' ); ?></option> 307 <option value="lower"><?php _e( 'Lower', 'gsf-locale' ); ?></option> 308 <option value="upper"><?php _e( 'Upper', 'gsf-locale' ); ?></option> 309 </select> 310 </div> 311 </li> 292 312 <?php 293 313 } -
gravity-slider-fields/trunk/gravity-slider-fields.php
r2187015 r2200584 4 4 Plugin URI: https://wordpress.org/plugins/gravity-slider-fields/ 5 5 Description: Adds slider fields to Gravity Forms 6 Version: 1. 66 Version: 1.7 7 7 Author: Typewheel 8 8 Author URI: https://typewheel.xyz/ … … 26 26 */ 27 27 28 define( 'GF_SLIDER_FIELDS_VERSION', '1. 6' );28 define( 'GF_SLIDER_FIELDS_VERSION', '1.7' ); 29 29 30 30 add_action( 'gform_loaded', array( 'GF_Slider_Fields_Bootstrap', 'load' ), 5 ); -
gravity-slider-fields/trunk/js/slider.js
r2073431 r2200584 28 28 var step = parseFloat(input.attr('step')); 29 29 var visibility = input.data('value-visibility'); 30 var connect = input.data('connect'); 30 31 var format = input.data('value-format'); 31 32 … … 85 86 decimals: decs, 86 87 }), 88 connect: connect, 87 89 tooltips: formatTooltip, 88 90 }); -
gravity-slider-fields/trunk/js/slider.min.js
r2073431 r2200584 1 jQuery(document).ready(function( v){var a=function(){var h=function(a){return Math.floor(a)===a?0:a.toString().split(".")[1].length||0};v(".slider-display").each(function(a,e){if(!v(this).hasClass("slider-initialized")){var i=v(this),t=i.prev(":input"),r=t.val(),l=t.attr("id"),n=(t.attr("tabindex"),t.data("min-relation")),s=t.data("max-relation"),d=parseFloat(t.attr("min")),o=parseFloat(t.attr("max")),m=parseFloat(t.attr("step")),c=t.data("value-visibility"),u=t.data("value-format");if("currency"==u){(f=t.data("currency")).decimals<h(m)&&(0==f.decimals?m=1:1==f.decimals?m=.1:2==f.decimals&&(m=.01));var p=f.decimals}else p=h(m);if("hover-drag"==c||"show"==c)if("currency"==u)var f=t.data("currency"),g=wNumb({decimals:f.decimals,mark:f.decimal_separator,thousand:f.thousand_separator,prefix:f.symbol_left+f.symbol_padding,postfix:f.symbol_padding+f.symbol_right});else g="decimal_comma"==u?wNumb({decimals:h(m),mark:",",thousand:"."}):wNumb({decimals:h(m)});else g=!1;noUiSlider.create(e,{start:[r],step:m,range:{min:[d],max:[o]},format:wNumb({decimals:p}),tooltips:g}),i.addClass("slider-initialized"),e.noUiSlider.on("update",function(a){t.attr("value",a),v(".gfield .slider").trigger("change")}),document.getElementById(l).addEventListener("change",function(){e.noUiSlider.set(this.value)}),i.append('<span class="min-val-relation">'+n+'</span><span class="max-val-relation">'+s+"</span>")}})};jQuery(document).bind("gform_page_loaded",function(){v(".gfield .slider").length&&a()}),a()});1 jQuery(document).ready(function(y){function a(){function v(a){return Math.floor(a)===a?0:a.toString().split(".")[1].length||0}y(".slider-display").each(function(a,e){if(!y(this).hasClass("slider-initialized")){var i=y(this),t=i.prev(":input"),l=t.val(),n=t.attr("id"),s=(t.attr("tabindex"),t.data("min-relation")),r=t.data("max-relation"),d=parseFloat(t.attr("min")),o=parseFloat(t.attr("max")),c=parseFloat(t.attr("step")),m=t.data("value-visibility"),u=t.data("connect"),f=t.data("value-format");if("currency"==f){if((g=t.data("currency")).decimals<v(c))if(0==g.decimals)c=1;else if(1==g.decimals)c=.1;else if(2==g.decimals)c=.01;var p=g.decimals}else p=v(c);if("hover-drag"==m||"show"==m)if("currency"==f)var g=t.data("currency"),h=wNumb({decimals:g.decimals,mark:g.decimal_separator,thousand:g.thousand_separator,prefix:g.symbol_left+g.symbol_padding,postfix:g.symbol_padding+g.symbol_right});else if("decimal_comma"==f)h=wNumb({decimals:v(c),mark:",",thousand:"."});else h=wNumb({decimals:v(c)});else h=!1;noUiSlider.create(e,{start:[l],step:c,range:{min:[d],max:[o]},format:wNumb({decimals:p}),connect:u,tooltips:h}),i.addClass("slider-initialized"),e.noUiSlider.on("update",function(a){t.attr("value",a),y(".gfield .slider").trigger("change")}),document.getElementById(n).addEventListener("change",function(){e.noUiSlider.set(this.value)}),i.append('<span class="min-val-relation">'+s+'</span><span class="max-val-relation">'+r+"</span>")}})}jQuery(document).bind("gform_page_loaded",function(){y(".gfield .slider").length&&a()}),a()}); -
gravity-slider-fields/trunk/readme.txt
r2187015 r2200584 7 7 Requires PHP: 5.6 8 8 Tested up to: 5.3 9 Stable tag: 1. 69 Stable tag: 1.7 10 10 License: GPLv2 or later 11 11 … … 65 65 == Changelog == 66 66 67 = 1.7 = 68 * Allow connecting handle to lower or upper edge 69 67 70 = 1.6 = 68 71 * Remove call to deprecated GF_Field::get_conditional_logic_event
Note: See TracChangeset
for help on using the changeset viewer.