1.9.3-b1

CalderaWP · Dec 17, 2020 · 4749809 · 4749809
1 parent 13d871c
commit 4749809
Show file tree

Hide file tree

Showing 55 changed files with 1,717 additions and 3,745 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/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.9.2 - 2020-12-17 */var resBaldrickTriggers;
+/*! GENERATED SOURCE FILE caldera-forms - v1.9.3-b1 - 2020-12-17 */var resBaldrickTriggers;
 
 jQuery(function($){
 	function fieldErrors(fields, $form, $notice) {

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.9.2 - 2020-12-17 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.9.3-b1 - 2020-12-17 *//**
  * 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.9.2 - 2020-12-17 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.9.3-b1 - 2020-12-17 *//*!
 * 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.9.2 - 2020-12-17 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.9.3-b1 - 2020-12-17 *//*!
  * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.

diff --git a/caldera-core.php b/caldera-core.php
@@ -4,7 +4,7 @@
   Plugin URI: https://CalderaForms.com
   Description: Easy to use, grid based responsive form builder for creating simple to complex forms.
   Author: Caldera Forms
-  Version: 1.9.2
+  Version: 1.9.3-b1
   Author URI: https://CalderaForms.com
   Text Domain: caldera-forms
   GitHub Plugin URI: https://github.com/CalderaWP/caldera-forms
@@ -53,7 +53,7 @@ function caldera_forms_wp_version_nag(){
 } else {
 	define('CFCORE_PATH', plugin_dir_path(__FILE__));
 	define('CFCORE_URL', plugin_dir_url(__FILE__));
-	define( 'CFCORE_VER', '1.9.2' );
+	define( 'CFCORE_VER', '1.9.3-b1' );
 	define('CFCORE_EXTEND_URL', 'https://api.calderaforms.com/1.0/');
 	define('CFCORE_BASENAME', plugin_basename(__FILE__));
 

diff --git a/classes/admin/assets.php b/classes/admin/assets.php
@@ -212,8 +212,9 @@ public static function enqueue_script($slug)
         if (1 !== strpos($slug, Caldera_Forms::PLUGIN_SLUG)) {
             $slug = self::slug($slug, true);
         }
-        //Hack for jQuery issues on main admin page
-        if( Caldera_Forms_Admin::is_main_page() || substr( $_GET['page'], 0, 17 ) === "caldera-forms-pin" ){
+        //Fix jQuery issues on main admin page and pinned entry viewer pages
+        var_dump(get_current_screen());
+        if( Caldera_Forms_Admin::is_main_page() || strpos( get_current_screen()->id, "caldera-forms-pin" ) !== false ){
             wp_enqueue_script( "jqueryOneTwelve",  CFCORE_URL . "/assets/build/js/jquery-12-4.min.js");
         }