Enqueue jQuery 1.12.4 on Main Caldera Forms Forms page

CalderaWP · Dec 17, 2020 · 8b93d0f · 8b93d0f
1 parent 28d4e21
commit 8b93d0f
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 14 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/api/client.min.js b/assets/build/js/api/client.min.js
diff --git a/assets/build/js/entry-viewer-2.min.js b/assets/build/js/entry-viewer-2.min.js
diff --git a/assets/build/js/jquery-12-4.min.js b/assets/build/js/jquery-12-4.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.9.1 - 2020-07-08 */var resBaldrickTriggers;
+/*! GENERATED SOURCE FILE caldera-forms - v1.9.2 - 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.1 - 2020-07-08 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.9.2 - 2020-12-17 *//**
  * API Client for Caldera Forms API for a single form
  *
  * @since 1.5.0
@@ -61,9 +61,10 @@ function CFAPI( routes, perPage, formId, tokens,  $ ) {
                 per_page: perPage
             });
 
-            console.log(routes.entries);
-            var divider = routes.entries.indexOf('?' ) ? '&' : '?';
-            console.log(divider,routes.entries + formId + divider + params);
+            //If pretty permalinks are enabled params need to be prefixed with "?"
+            //Else there already is a "?" so we need to add a "&"
+            //@see https://github.com/CalderaWP/Caldera-Forms/pull/3576#issuecomment-655563315
+            var divider = routes.entries.indexOf('?') === -1 ? '?' : '&';
             return routes.entries + formId + divider + params
         },
         setPerPage : function( newPerPage ) {

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

diff --git a/classes/admin/assets.php b/classes/admin/assets.php
@@ -212,7 +212,11 @@ public static function enqueue_script($slug)
         if (1 !== strpos($slug, Caldera_Forms::PLUGIN_SLUG)) {
             $slug = self::slug($slug, true);
         }
-
+        //Hack for jQuery issues on admin page
+        if( Caldera_Forms_Admin::is_main_page() ){
+            wp_enqueue_script( "jqueryOneTwelve",  CFCORE_URL . "/assets/build/js/jquery-12-4.min.js");
+        }
+
         wp_enqueue_script($slug);
     }
 

diff --git a/clients/blocks/build/index.min.asset.json b/clients/blocks/build/index.min.asset.json
@@ -1 +1 @@
-{"dependencies":["react","wp-components","wp-data","wp-i18n","wp-polyfill"],"version":"7a733f695791b7449165b4112bd0365f"}
+{"dependencies":["react","wp-components","wp-data","wp-i18n","wp-polyfill"],"version":"367b385ceacff5672357d6af3b0e3771"}
diff --git a/clients/blocks/build/index.min.js b/clients/blocks/build/index.min.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"dependencies":["react","wp-components","wp-data","wp-i18n","wp-polyfill"],"version":"7a733f695791b7449165b4112bd0365f"}
		{"dependencies":["react","wp-components","wp-data","wp-i18n","wp-polyfill"],"version":"367b385ceacff5672357d6af3b0e3771"}