Updates to 3.6.1

codewurker · May 25, 2024 · aab9e4b · aab9e4b
1 parent c918cbe
commit aab9e4b
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 34 deletions.
diff --git a/admin/gravityforms-product-addons-admin.php b/admin/gravityforms-product-addons-admin.php
@@ -25,7 +25,7 @@ private function __construct() {
 		add_action( 'wp_ajax_wc_gravityforms_get_form_data', array( $this, 'on_wc_gravityforms_get_form_data' ) );
 	}
 
-	public function on_admin_enqueue_scripts() {
+	public function on_admin_enqueue_scripts($hook) {
 		wp_enqueue_style( 'woocommerce_gravityforms_product_addons_css', plugins_url( basename( dirname( __DIR__ ) ) ) . '/assets/css/admin.css' );
 
 		$params = array(
@@ -59,13 +59,16 @@ public function on_admin_enqueue_scripts() {
 			true
 		);
 
-		wp_enqueue_script(
-			'wc-gfpa-admin-js',
-			plugins_url( basename( dirname( __DIR__ ) ) ) . '/assets/js/gravityforms-product-addons-admin.js',
-			array( 'jquery', 'jquery-blockui', 'woocommerce_gravityforms_product_addons_js' ),
-			wc_gfpa()->assets_version,
-			true
-		);
+
+		if ($hook === 'forms_page_gf_edit_forms' || $hook === 'toplevel_page_gf_edit_forms') {
+            wp_enqueue_script(
+                'wc-gfpa-admin-js',
+                plugins_url( basename( dirname( __DIR__ ) ) ) . '/assets/js/gravityforms-product-addons-admin.js',
+                array( 'jquery', 'jquery-blockui', 'woocommerce_gravityforms_product_addons_js' ),
+                wc_gfpa()->assets_version,
+                true
+            );
+        }
 
 		wp_localize_script( 'woocommerce_gravityforms_product_addons_js', 'wc_gf_addons', $params );
 	}

diff --git a/assets/js/gravityforms-product-addons-admin.js b/assets/js/gravityforms-product-addons-admin.js
@@ -19,11 +19,18 @@ class GravityFormsProductAddonsAdmin {
     }
 
     observeGFormAvailability() {
+        let mutationCount = 0;
+        const maxMutations = 100; // Set a limit to avoid infinite loop
+
         const observer = new MutationObserver((mutations, obs) => {
+            mutationCount += mutations.length;
+
             if (window.gform) {
-                console.log('gform is now available');
-                this.init();
                 obs.disconnect(); // Disconnect observer once gform is available
+                this.init();
+            } else if (mutationCount > maxMutations) {
+                obs.disconnect(); // Disconnect observer after maxMutations to avoid infinite loop
+                console.warn('Stopped observing after reaching the mutation limit.');
             }
         });
 
@@ -59,8 +66,6 @@ class GravityFormsProductAddonsAdmin {
                 }
             });
 
-            console.log('Filtered Tags: ', filtered_tags);
-
             mergeTags[key] = {
                 label: label,
                 tags: filtered_tags

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,10 @@
 *** Gravity Forms Product Add-Ons Changelog ***
-2024.01.27 - version 3.6.0
+2024.05.24 - version 3.6.1
+    * Fix: Fix issue with the mutation observer causing an infinate loop on some sites where gform is not available.
+    * Fix: Only enqueue the admin scripts on a Gravity Forms admin page.
+    * WC and WP Compatibility Tags.
+
+2024.05.15 - version 3.6.0
     * New: Integration with WooCommerce Bookings. The integration is basic, but allows for booking product costs to be correctly displayed in the totals section on the product page.
     * New: Updated styles to modernize and cleanup the look of the totals section.
     * New: Include custom merge tags for WooCommerce order and order item data.

diff --git a/gravityforms-product-addons.php b/gravityforms-product-addons.php
@@ -3,21 +3,21 @@
  * Plugin Name: WooCommerce Gravity Forms Product Add-Ons
  * Plugin URI: http://woothemes.com/products/gravity-forms-add-ons/
  * Description: Allows you to use Gravity Forms on individual WooCommerce products. Requires the Gravity Forms plugin to work.
- * Version: 3.6.0
+ * Version: 3.6.1
  * Author: Element Stark
  * Author URI: https://www.elementstark.com/
  * Developer: Lucas Stark
  * Developer URI: http://www.elementstark.com/
  * Requires at least: 3.1
- * Tested up to: 6.4
+ * Tested up to: 6.5
  * Text Domain: wc_gf_addons
 
  * Copyright: © 2009-2024 Element Stark.
  * License: GNU General Public License v3.0
  * License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
  * WC requires at least: 7.0
- * WC tested up to: 8.6
+ * WC tested up to: 8.9
  * Woo: 18633:a6ac0ab1a1536e3a357ccf24c0650ed0
  *
  * @package WooCommerce Gravity Forms Product Add-Ons

diff --git a/i18n/languages/woocommerce-gravityforms-product-addons.pot b/i18n/languages/woocommerce-gravityforms-product-addons.pot
@@ -2,11 +2,11 @@
 # This file is distributed under the GNU General Public License v3.0.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Gravity Forms Product Add-Ons 3.6.0\n"
+"Project-Id-Version: WooCommerce Gravity Forms Product Add-Ons 3.6.1\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/woocommerce-gravityforms-product-"
 "addons\n"
-"POT-Creation-Date: 2024-05-15 10:49:50+00:00\n"
+"POT-Creation-Date: 2024-05-24 12:24:29+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,57 +66,57 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:79
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:79
+#: admin/gravityforms-product-addons-admin.php:82
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:82
 #: dist/woocommerce-gravityforms-product-addons/gravityforms-product-addons.php:91
 #: gravityforms-product-addons.php:91
 msgid ""
 "<strong>Gravity Forms Not Found</strong> &#8211; The Gravity Forms Plugin "
 "is required to build and manage the forms for your products."
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:82
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:82
+#: admin/gravityforms-product-addons-admin.php:85
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:85
 #: dist/woocommerce-gravityforms-product-addons/gravityforms-product-addons.php:94
 #: gravityforms-product-addons.php:94
 msgid "Get Gravity Forms"
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:97
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:97
+#: admin/gravityforms-product-addons-admin.php:100
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:100
 msgid ""
 "<strong>Gravity Forms Duplicate Prevention Active</strong></h4><p>The "
 "<strong>Gravity Forms Product Addon Extension</strong> can not function "
 "properly if this additional plugin is active.  Please <a "
 "href=\"%s\">disable</a> it for proper functionality of the extension.</p>"
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:128
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:128
+#: admin/gravityforms-product-addons-admin.php:131
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:131
 msgid "Gravity Forms"
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:201
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:201
+#: admin/gravityforms-product-addons-admin.php:204
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:204
 msgid "No Form ID"
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:234
+#: admin/gravityforms-product-addons-admin.php:237
 #: admin/views/html-gravityforms-addons-wc-metabox.php:410
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:234
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:237
 #: dist/woocommerce-gravityforms-product-addons/admin/views/html-gravityforms-addons-wc-metabox.php:410
 msgid "Quantity Field"
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:237
+#: admin/gravityforms-product-addons-admin.php:240
 #: admin/views/html-gravityforms-addons-wc-metabox.php:413
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:237
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:240
 #: dist/woocommerce-gravityforms-product-addons/admin/views/html-gravityforms-addons-wc-metabox.php:413
 msgid "A field to use to control cart item quantity."
 msgstr ""
 
-#: admin/gravityforms-product-addons-admin.php:243
-#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:243
+#: admin/gravityforms-product-addons-admin.php:246
+#: dist/woocommerce-gravityforms-product-addons/admin/gravityforms-product-addons-admin.php:246
 msgid "No suitable quantity fields found."
 msgstr ""