fix extra comma in conditionals.js causing minification error #2766

CalderaWP · Nov 19, 2018 · a8fa334 · a8fa334
2 parents be6d6ea + 4d04990
commit a8fa334
Show file tree

Hide file tree

Showing 24 changed files with 6,666 additions and 4,743 deletions.
diff --git a/assets/build/css/caldera-forms-front.min.css b/assets/build/css/caldera-forms-front.min.css
diff --git a/assets/build/js/conditionals.min.js b/assets/build/js/conditionals.min.js
diff --git a/assets/build/js/frontend-script-init.min.js b/assets/build/js/frontend-script-init.min.js
diff --git a/assets/css/caldera-forms-front.css b/assets/css/caldera-forms-front.css
diff --git a/assets/js/caldera-forms-front.js b/assets/js/caldera-forms-front.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-02 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-19 *//**
  * Simple event bindings for form state
  *
  * In general, access through CFState.events() not directly.

diff --git a/assets/js/conditionals.js b/assets/js/conditionals.js
@@ -397,7 +397,7 @@ var calders_forms_check_conditions, calders_forms_init_conditions;
 			return null;
 		}
 
-		function emitConditionalEvent(eventName,field,formId,){
+		function emitConditionalEvent(eventName,field,formId){
 			function createEventName(){
 				return 'cf.conditionals.' + eventName;
 			}

diff --git a/assets/js/entry-viewer-2.js b/assets/js/entry-viewer-2.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-02 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-19 *//**
  * API Client for Caldera Forms API for a single form
  *
  * @since 1.5.0

diff --git a/assets/js/parsley.min.js b/assets/js/parsley.min.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-02 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-19 *//*!
 * Parsley.js
 * Version 2.8.1 - built Sat, Feb 3rd 2018, 2:27 pm
 * http://parsleyjs.org

diff --git a/assets/js/vue.js b/assets/js/vue.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-02 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.7.4 - 2018-11-19 *//*!
  * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.

diff --git a/cf2/Fields/RenderField.php b/cf2/Fields/RenderField.php
@@ -130,7 +130,7 @@ public function data()
                 'multiUploadText' => ! empty($this->field[ 'config' ]['multi_upload_text' ]) ? $this->field[ 'config' ]['multi_upload_text' ] : false,
                 'allowedTypes' => $this->getAllowedTypes(),
                 'control' => uniqid($this->getOuterIdAttr() ),
-                'usePreviews' => ! empty($this->field[ 'config']['use_image_previews']) ? $this->field[ 'config']['use_image_previews'] : false,
+                'usePreviews' => ! empty($this->field[ 'config']['use_image_previews']) ? true : false,
 				'previewWidth' => ! empty( $this->field[ 'config']['preview_width'] ) ? intval( $this->field[ 'config']['preview_width'] ) : 24,
 				'previewHeight' => ! empty( $this->field[ 'config']['preview_height'] ) ? intval( $this->field[ 'config']['preview_height'] ) : 24,
             ];

diff --git a/classes/forms.php b/classes/forms.php
@@ -255,10 +255,8 @@ protected static function get_stored_forms() {
 
             }
 		}
-        if( ! is_array( self::$stored_forms ) ){
-            self::$stored_forms = [];
-        }
-		return self::$stored_forms;
+
+        return is_array(self::$stored_forms ) ? self::$stored_forms : [];
 	}
 
 	/**