Calculated Fields Form - Version 1.0.449

Version Description

  • Modifies the SUM and CONCATENATE operations for accepting plain objects as arguments.
Download this release

Release Info

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

Code changes from version 1.0.447 to 1.0.449

Files changed (6) hide show
  1. README.txt +11 -12
  2. changelog.txt +10 -5
  3. cp_calculatedfieldsf_free.php +2 -2
  4. js/fbuilder-pro-public.jquery.js +1 -1
  5. js/fields-public/34_fbuilder.fhtml.js +4 -1
  6. js/modules/01_mathematical_logical/public/module_public.js +10 -2
README.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: codepeople
3
  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: 5.6
7
  Stable tag: trunk
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -949,6 +949,15 @@ This way the special characters should show correctly.
949
 
950
  == Changelog ==
951
 
 
 
 
 
 
 
 
 
 
952
  = 1.0.447 =
953
 
954
  * Improves the plugin's performance.
@@ -986,18 +995,8 @@ This way the special characters should show correctly.
986
 
987
  * Modifies the setChoices method in the Radio Buttons, Checkbox, and DropDown controls.
988
 
989
- = 1.0.439 =
990
-
991
- * Modifies the Phone control.
992
- * Modifies the Users Permissions add-on (Developer and Platinum versions of the plugin).
993
-
994
- = 1.0.438 =
995
-
996
- * Fixes an issue duplicating summary controls.
997
- * Modifies the defaultCalc operation for accepting an object.
998
-
999
  == Upgrade Notice ==
1000
 
1001
- = 1.0.447 =
1002
 
1003
  Important note: If you are using the Professional version don't update via the WP dashboard but using your personal update link. Contact us if you need further information: http://cff.dwbooster.com/contact-us
3
  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: 5.7
7
  Stable tag: trunk
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
949
 
950
  == Changelog ==
951
 
952
+ = 1.0.449 =
953
+
954
+ * Modifies the SUM and CONCATENATE operations for accepting plain objects as arguments.
955
+
956
+ = 1.0.448 =
957
+
958
+ * Modifies the HTML Content fields.
959
+ * Improves the plugin's performance.
960
+
961
  = 1.0.447 =
962
 
963
  * Improves the plugin's performance.
995
 
996
  * Modifies the setChoices method in the Radio Buttons, Checkbox, and DropDown controls.
997
 
 
 
 
 
 
 
 
 
 
 
998
  == Upgrade Notice ==
999
 
1000
+ = 1.0.449 =
1001
 
1002
  Important note: If you are using the Professional version don't update via the WP dashboard but using your personal update link. Contact us if you need further information: http://cff.dwbooster.com/contact-us
changelog.txt CHANGED
@@ -1,5 +1,14 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
3
  = 1.0.447 =
4
 
5
  * Improves the plugin's performance.
@@ -521,8 +530,4 @@
521
  * Modifies the calculation's module for triggering the equationsQueueEmpty event when the queue of equations be emptied.
522
  * Modifies the calculate buttons to allow display a calculation in progress indicator until all equations be evaluated.
523
  * Prevents the form be submitted if there are equations pending to be evaluated, even if they dependen on external apis or services (Professional, Developer and Platinum versions of the plugin)
524
- * Modifies the DISTANCE operations module, to tell the plugin the Google Maps APIs are being instantiated, and the evaluation of the equations is pending (Developer and Platinum versions of the plugin)
525
-
526
- = 1.0.348 =
527
-
528
- * Improves the appearance of the forms list in the medium-size screens.
1
  == Changelog ==
2
 
3
+ = 1.0.449 =
4
+
5
+ * Modifies the SUM and CONCATENATE operations for accepting plain objects as arguments.
6
+
7
+ = 1.0.448 =
8
+
9
+ * Modifies the HTML Content fields.
10
+ * Improves the plugin's performance.
11
+
12
  = 1.0.447 =
13
 
14
  * Improves the plugin's performance.
530
  * Modifies the calculation's module for triggering the equationsQueueEmpty event when the queue of equations be emptied.
531
  * Modifies the calculate buttons to allow display a calculation in progress indicator until all equations be evaluated.
532
  * Prevents the form be submitted if there are equations pending to be evaluated, even if they dependen on external apis or services (Professional, Developer and Platinum versions of the plugin)
533
+ * Modifies the DISTANCE operations module, to tell the plugin the Google Maps APIs are being instantiated, and the evaluation of the equations is pending (Developer and Platinum versions of the plugin)
 
 
 
 
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.0.447
7
  Text Domain: calculated-fields-form
8
  Author: CodePeople
9
  Author URI: https://cff.dwbooster.com
@@ -16,7 +16,7 @@ if(!defined('WP_DEBUG') || true != WP_DEBUG)
16
  }
17
 
18
  // Defining main constants
19
- define('CP_CALCULATEDFIELDSF_VERSION', '1.0.447' );
20
  define('CP_CALCULATEDFIELDSF_MAIN_FILE_PATH', __FILE__ );
21
  define('CP_CALCULATEDFIELDSF_BASE_PATH', dirname( CP_CALCULATEDFIELDSF_MAIN_FILE_PATH ) );
22
  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.0.449
7
  Text Domain: calculated-fields-form
8
  Author: CodePeople
9
  Author URI: https://cff.dwbooster.com
16
  }
17
 
18
  // Defining main constants
19
+ define('CP_CALCULATEDFIELDSF_VERSION', '1.0.449' );
20
  define('CP_CALCULATEDFIELDSF_MAIN_FILE_PATH', __FILE__ );
21
  define('CP_CALCULATEDFIELDSF_BASE_PATH', dirname( CP_CALCULATEDFIELDSF_MAIN_FILE_PATH ) );
22
  define('CP_CALCULATEDFIELDSF_BASE_NAME', plugin_basename( CP_CALCULATEDFIELDSF_MAIN_FILE_PATH ) );
js/fbuilder-pro-public.jquery.js CHANGED
@@ -503,8 +503,8 @@
503
  hiddenByContainer : {},
504
  getItem: function( name )
505
  {
506
- var regExp = new RegExp((parseInt(name,10) == name) ? 'fieldname'+name+'_' : name+'_', i);
507
  if(name in fieldsIndex) return items[fieldsIndex[name]];
 
508
  for( var i in items )
509
  {
510
  if( items[ i ].name == name || regExp.test(items[ i ].name))
503
  hiddenByContainer : {},
504
  getItem: function( name )
505
  {
 
506
  if(name in fieldsIndex) return items[fieldsIndex[name]];
507
+ var regExp = new RegExp((parseInt(name,10) == name) ? 'fieldname'+name+'_' : name+'_', i);
508
  for( var i in items )
509
  {
510
  if( items[ i ].name == name || regExp.test(items[ i ].name))
js/fields-public/34_fbuilder.fhtml.js CHANGED
@@ -7,7 +7,10 @@
7
  fcontent:"",
8
  show:function()
9
  {
10
- return '<div class="fields '+this.csslayout+' '+this.name+' cff-html-field" id="field'+this.form_identifier+'-'+this.index+'"><div id="'+this.name+'" class="dfield">'+$( '<div/>' ).html( this.fcontent ).html()+'</div><div class="clearer"></div></div>';
 
 
 
11
  }
12
  }
13
  );
7
  fcontent:"",
8
  show:function()
9
  {
10
+ var content = this.fcontent;
11
+ content = content.replace(/\(\s*document\s*\)\.one\(\s*['"]showHideDepEvent['"]/ig,
12
+ '(window).one("showHideDepEvent"');
13
+ return '<div class="fields '+this.csslayout+' '+this.name+' cff-html-field" id="field'+this.form_identifier+'-'+this.index+'"><div id="'+this.name+'" class="dfield">'+content+'</div><div class="clearer"></div></div>';
14
  }
15
  }
16
  );
js/modules/01_mathematical_logical/public/module_public.js CHANGED
@@ -134,7 +134,10 @@ fbuilderjQuery[ 'fbuilder' ][ 'modules' ][ 'default' ] = {
134
  var r = 0, t;
135
  for(var i in arguments)
136
  {
137
- if(Array.isArray(arguments[i])) r += SUM.apply(this,arguments[i]);
 
 
 
138
  else
139
  {
140
  t = arguments[i]*1;
@@ -151,8 +154,13 @@ fbuilderjQuery[ 'fbuilder' ][ 'modules' ][ 'default' ] = {
151
  {
152
  var r = '';
153
  for(var i in arguments)
154
- if(Array.isArray(arguments[i])) r += CONCATENATE.apply(this,arguments[i]);
 
 
 
 
155
  else r += (new String(arguments[i]));
 
156
  return r;
157
  };
158
  } // End if window.CONCATENATE
134
  var r = 0, t;
135
  for(var i in arguments)
136
  {
137
+ if(Array.isArray(arguments[i]))
138
+ r += SUM.apply(this,arguments[i]);
139
+ else if(jQuery.isPlainObject(arguments[i]))
140
+ r += SUM.apply(this,Object.values(arguments[i]));
141
  else
142
  {
143
  t = arguments[i]*1;
154
  {
155
  var r = '';
156
  for(var i in arguments)
157
+ {
158
+ if(Array.isArray(arguments[i]))
159
+ r += CONCATENATE.apply(this,arguments[i]);
160
+ else if(jQuery.isPlainObject(arguments[i]))
161
+ r += CONCATENATE.apply(this,Object.values(arguments[i]));
162
  else r += (new String(arguments[i]));
163
+ }
164
  return r;
165
  };
166
  } // End if window.CONCATENATE