Calculated Fields Form - Version 1.1.116

Version Description

  • Modifies the calculated fields to reduce the number of endless loops.
  • Modifies the Google Places add-on to fix a conflict with the Yoast sitemap (Platinum plugin version).
  • Fixes a notice in the WebMerge add-on (Platinum plugin version).
  • Minor modifications in the interface of other add-ons (Platinum plugin version).
Download this release

Release Info

Developer codepeople
Plugin Icon 128x128 Calculated Fields Form
Version 1.1.116
Comparing to
See all releases

Code changes from version 1.1.115 to 1.1.116

Files changed (5) hide show
  1. README.txt +9 -8
  2. changelog.txt +7 -0
  3. cp_calculatedfieldsf_free.php +2 -2
  4. js/fbuilder-pro-public.jquery.js +1 -1
  5. js/fields-public/fbuilder.fcalculated.js +7 -2
README.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://cff.dwbooster.com
4
  Tags: form,quote form,contact form,form builder,calculator,calculated,quote calculator,forms,form editor,advanced forms,payment calculator,payment,recurring payment,quote,fields,calculated field,price calculator,email,form design,paypal,equation editor,formula,equation,quote calculator,post,posts,plugin,widget,admin,sidebar,images,image,page,shortcode,products form,woocommerce,addons,layout,session,post,cookie,get,webhook,Dropbox,pdf,language
5
  Requires at least: 3.0.5
6
  Tested up to: 6.0
7
- Stable tag: 1.1.115
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -965,6 +965,13 @@ A: Please, follow the steps below:
965
 
966
  == Changelog ==
967
 
 
 
 
 
 
 
 
968
  = 1.1.115 =
969
 
970
  * Modifies the number and currency controls to allow including buttons to increase and decrease their values.
@@ -1008,10 +1015,4 @@ A: Please, follow the steps below:
1008
  = 1.1.107 =
1009
 
1010
  * Allows the associate audio tutorials to the form fields.
1011
- * Modifies the WooCommerce add-on to support third-party plugins like 'Ajax add to cart for WooCommerce'.
1012
-
1013
- = 1.1.106 =
1014
-
1015
- * Implements the logarithmic slider.
1016
- * Implements a new attribute in the plugin settings page to disable form revisions.
1017
- * Fixes an issue with pending equations.
4
  Tags: form,quote form,contact form,form builder,calculator,calculated,quote calculator,forms,form editor,advanced forms,payment calculator,payment,recurring payment,quote,fields,calculated field,price calculator,email,form design,paypal,equation editor,formula,equation,quote calculator,post,posts,plugin,widget,admin,sidebar,images,image,page,shortcode,products form,woocommerce,addons,layout,session,post,cookie,get,webhook,Dropbox,pdf,language
5
  Requires at least: 3.0.5
6
  Tested up to: 6.0
7
+ Stable tag: 1.1.116
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
965
 
966
  == Changelog ==
967
 
968
+ = 1.1.116 =
969
+
970
+ * Modifies the calculated fields to reduce the number of endless loops.
971
+ * Modifies the Google Places add-on to fix a conflict with the Yoast sitemap (Platinum plugin version).
972
+ * Fixes a notice in the WebMerge add-on (Platinum plugin version).
973
+ * Minor modifications in the interface of other add-ons (Platinum plugin version).
974
+
975
  = 1.1.115 =
976
 
977
  * Modifies the number and currency controls to allow including buttons to increase and decrease their values.
1015
  = 1.1.107 =
1016
 
1017
  * Allows the associate audio tutorials to the form fields.
1018
+ * Modifies the WooCommerce add-on to support third-party plugins like 'Ajax add to cart for WooCommerce'.
 
 
 
 
 
 
changelog.txt CHANGED
@@ -1,5 +1,12 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
3
  = 1.1.115 =
4
 
5
  * Modifies the number and currency controls to allow including buttons to increase and decrease their values.
1
  == Changelog ==
2
 
3
+ = 1.1.116 =
4
+
5
+ * Modifies the calculated fields to reduce the number of endless loops.
6
+ * Modifies the Google Places add-on to fix a conflict with the Yoast sitemap (Platinum plugin version).
7
+ * Fixes a notice in the WebMerge add-on (Platinum plugin version).
8
+ * Minor modifications in the interface of other add-ons (Platinum plugin version).
9
+
10
  = 1.1.115 =
11
 
12
  * Modifies the number and currency controls to allow including buttons to increase and decrease their values.
cp_calculatedfieldsf_free.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Calculated Fields Form
4
  Plugin URI: https://cff.dwbooster.com
5
  Description: Create forms with field values calculated based in other form field values.
6
- Version: 1.1.115
7
  Text Domain: calculated-fields-form
8
  Author: CodePeople
9
  Author URI: https://cff.dwbooster.com
@@ -15,7 +15,7 @@ if ( ! defined( 'WP_DEBUG' ) || true != WP_DEBUG ) {
15
  }
16
 
17
  // Defining main constants
18
- define( 'CP_CALCULATEDFIELDSF_VERSION', '1.1.115' );
19
  define( 'CP_CALCULATEDFIELDSF_MAIN_FILE_PATH', __FILE__ );
20
  define( 'CP_CALCULATEDFIELDSF_BASE_PATH', dirname( CP_CALCULATEDFIELDSF_MAIN_FILE_PATH ) );
21
  define( 'CP_CALCULATEDFIELDSF_BASE_NAME', plugin_basename( CP_CALCULATEDFIELDSF_MAIN_FILE_PATH ) );
3
  Plugin Name: Calculated Fields Form
4
  Plugin URI: https://cff.dwbooster.com
5
  Description: Create forms with field values calculated based in other form field values.
6
+ Version: 1.1.116
7
  Text Domain: calculated-fields-form
8
  Author: CodePeople
9
  Author URI: https://cff.dwbooster.com
15
  }
16
 
17
  // Defining main constants
18
+ define( 'CP_CALCULATEDFIELDSF_VERSION', '1.1.116' );
19
  define( 'CP_CALCULATEDFIELDSF_MAIN_FILE_PATH', __FILE__ );
20
  define( 'CP_CALCULATEDFIELDSF_BASE_PATH', dirname( CP_CALCULATEDFIELDSF_MAIN_FILE_PATH ) );
21
  define( 'CP_CALCULATEDFIELDSF_BASE_NAME', plugin_basename( CP_CALCULATEDFIELDSF_MAIN_FILE_PATH ) );
js/fbuilder-pro-public.jquery.js CHANGED
@@ -1,4 +1,4 @@
1
- $.fbuilder['version'] = '1.1.115';
2
  $.fbuilder['controls'] = $.fbuilder['controls'] || {};
3
  $.fbuilder['forms'] = $.fbuilder['forms'] || {};
4
 
1
+ $.fbuilder['version'] = '1.1.116';
2
  $.fbuilder['controls'] = $.fbuilder['controls'] || {};
3
  $.fbuilder['forms'] = $.fbuilder['forms'] || {};
4
 
js/fields-public/fbuilder.fcalculated.js CHANGED
@@ -265,6 +265,11 @@
265
  };
266
 
267
  // Private function, the variable names in the equations are replaced by its values, return the equation result or false if error
 
 
 
 
 
268
  _calculate = function(eq, suffix, __ME__)
269
  {
270
  var e = $.fbuilder['forms'][suffix].getItem(__ME__),
@@ -298,7 +303,7 @@
298
  }
299
  try
300
  {
301
- var r = eval(eq.replace(/^\(/, '').replace(/\)$/, '').replace(/\b__ME__\b/g, __ME__)); // Evaluate the final equation
302
  return (typeof r != 'undefined' && _validate_result(r)) ? r : false;
303
  }
304
  catch(e)
@@ -527,10 +532,10 @@
527
  field.val((result !== false) ? me.format(result, eq_obj.resultField.configuration()) : '');
528
  if(bk != field.val())
529
  {
 
530
  field.trigger('calcualtedfield_changed');
531
  field.change();
532
  }
533
- field.data('bk',field.val());
534
  }
535
  }
536
 
265
  };
266
 
267
  // Private function, the variable names in the equations are replaced by its values, return the equation result or false if error
268
+ _eval = function(eq)
269
+ {
270
+ return eval(eq); // Evaluate the final equation
271
+ };
272
+
273
  _calculate = function(eq, suffix, __ME__)
274
  {
275
  var e = $.fbuilder['forms'][suffix].getItem(__ME__),
303
  }
304
  try
305
  {
306
+ var r = _eval(eq.replace(/^\(/, '').replace(/\)$/, '').replace(/\b__ME__\b/g, __ME__)); // Evaluate the final equation
307
  return (typeof r != 'undefined' && _validate_result(r)) ? r : false;
308
  }
309
  catch(e)
532
  field.val((result !== false) ? me.format(result, eq_obj.resultField.configuration()) : '');
533
  if(bk != field.val())
534
  {
535
+ field.data('bk',field.val());
536
  field.trigger('calcualtedfield_changed');
537
  field.change();
538
  }
 
539
  }
540
  }
541