Merge branch 'develop' into 'master'

release 1.2.1 See merge request products/gravity-integrations/field-helper-for-gravity-forms!52
BrilliantPlugins · Sep 28, 2020 · 25491ca · 25491ca
2 parents dc853e9 + 6c13abf
commit 25491ca
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 64 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -37,7 +37,6 @@ Build Plugin Package:
     name: "$PLUGIN_SLUG.$CI_COMMIT_TAG"
     paths:
       - $PLUGIN_SLUG.$CI_COMMIT_TAG.zip
-  when: manual
 
 Deploy Documentation:
   stage: deploy

diff --git a/assets/css/gravity-forms-field-helper.css b/assets/css/gravity-forms-field-helper.css
@@ -0,0 +1,5 @@
+input[pattern]:invalid{
+    color: red;
+    outline: 1px solid red;
+    border: 1px solid red;
+}
diff --git a/assets/js/gravityforms-field-helper-admin.js → ...ts/js/gravity-forms-field-helper-admin.js b/assets/js/gravityforms-field-helper-admin.js → ...ts/js/gravity-forms-field-helper-admin.js
diff --git a/assets/js/gravity-forms-field-helper.js b/assets/js/gravity-forms-field-helper.js
@@ -0,0 +1,19 @@
+'use strict';
+(function($) {
+    $(document).ready(function() {
+
+        /**
+         * Disable submit/next buttons for invalid input patterns.
+         *
+         * @since 1.2.1
+         */
+        $('body').on('change', 'form[id^="gform_"] input[pattern]', function() {
+            if ($(this).is(':invalid')) {
+                $('.gform_button, .gform_next_button').attr('disabled', true);
+            } else {
+                $('.gform_button, .gform_next_button').attr('disabled', false);
+            }
+        });
+
+    });
+}(jQuery));
diff --git a/bin/gitlab-ci-lint.sh b/bin/gitlab-ci-lint.sh
diff --git a/bin/php-getFilesChanged.sh b/bin/php-getFilesChanged.sh
diff --git a/bin/php-syntaxChecker-changed.sh b/bin/php-syntaxChecker-changed.sh
diff --git a/bin/php-syntaxChecker-full.sh b/bin/php-syntaxChecker-full.sh
diff --git a/bin/php-syntaxChecker-skipFiles b/bin/php-syntaxChecker-skipFiles
diff --git a/class-gf-input-pattern.php b/class-gf-input-pattern.php
@@ -125,11 +125,24 @@ public function __construct() {
 
 		// Frontend.
 		add_filter( 'gform_field_content', array( $this, 'add_input_pattern' ), 15, 5 );
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_assets' ) );
 
 		// Validation.
 		add_filter( 'gform_field_validation', array( $this, 'validate_input_pattern' ), 10, 4 );
 	}
 
+	/**
+	 * Enqueue frontend styles.
+	 *
+	 * @since 1.2.1
+	 *
+	 * @return void
+	 */
+	public function enqueue_assets() {
+		wp_enqueue_style( 'gravity-forms-field-helper' );
+		wp_enqueue_script( 'gravity-forms-field-helper' );
+	}
+
 	/**
 	 * Render plugin page content.
 	 *

diff --git a/documentation/CHANGELOG.md b/documentation/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+# 1.2.1 | 2020-09-28
+
+## Features
+
+- Highlight fields with invalid input patterns.
+- Disable form submission when a field has an invalid input pattern.
+
 # 1.2.0 | 2020-09-28
 
 ## Features

diff --git a/field-helper-for-gravity-forms.php b/field-helper-for-gravity-forms.php
@@ -3,7 +3,7 @@
  * Plugin Name: Field Helper for Gravity Forms
  * Plugin URI: https://brilliantplugins.com/
  * Description: Enables Gravity Forms users to set consistent, human-friendly field names for use in the Gravity Forms REST API.
- * Version: 1.2.0
+ * Version: 1.2.1
  * Author: BrilliantPlugins
  * Author URI: https://brilliantplugins.com
  * License: GPL-2.0+
@@ -30,7 +30,7 @@
  * @package gravity-forms-field-helper
  */
 
-define( 'GF_FIELD_HELPER_VERSION', '1.2.0' );
+define( 'GF_FIELD_HELPER_VERSION', '1.2.1' );
 define( 'GF_FIELD_HELPER_FILE', __FILE__ );
 define( 'GF_FIELD_HELPER_SLUG', 'gravity-forms-field-helper' );
 
@@ -74,7 +74,10 @@ public static function load_field_helper() {
 		GFAddOn::register( 'GF_Input_Pattern' );
 
 		// Backend assets.
-		add_action( 'admin_enqueue_scripts', 'GF_Field_Helper_Bootstrap::enqueue_assets' );
+		add_action( 'admin_enqueue_scripts', 'GF_Field_Helper_Bootstrap::register_backend_assets' );
+
+		// Frontend assets.
+		add_action( 'wp_enqueue_scripts', 'GF_Field_Helper_Bootstrap::register_frontend_assets' );
 	}
 
 	/**
@@ -84,10 +87,23 @@ public static function load_field_helper() {
 	 *
 	 * @return void
 	 */
-	public static function enqueue_assets() {
+	public static function register_backend_assets() {
 		wp_register_script( 'gravity-forms-field-helper-admin', plugin_dir_url( GF_FIELD_HELPER_FILE ) . '/assets/js/gravity-forms-field-helper-admin.js', array( 'jquery' ), GF_FIELD_HELPER_VERSION, true );
 	}
 
+	/**
+	 * Register/enqueue frontend assets.
+	 *
+	 * @since 1.2.1
+	 *
+	 * @return void
+	 */
+	public static function register_frontend_assets() {
+		wp_register_script( 'gravity-forms-field-helper', plugin_dir_url( GF_FIELD_HELPER_FILE ) . '/assets/js/gravity-forms-field-helper.js', array( 'jquery' ), GF_FIELD_HELPER_VERSION, true );
+
+		wp_register_style( 'gravity-forms-field-helper', plugin_dir_url( GF_FIELD_HELPER_FILE ) . '/assets/css/gravity-forms-field-helper.css', array(), GF_FIELD_HELPER_VERSION );
+	}
+
 	/**
 	 * Register custom REST API endpoint.
 	 *