From c99a1899872ef1eeee080e2505a49ee9e08c0125 Mon Sep 17 00:00:00 2001
From: solonmedia <support@solon.media>
Date: Mon, 22 Jan 2024 19:02:17 -0600
Subject: [PATCH] Refactored to use inputfeild.js events

---
 CssGradient.php              |  1 -
 FieldtypeGrapick.module.php  | 34 ---------------
 InputfieldGrapick.js         | 81 +++++-------------------------------
 InputfieldGrapick.module.php | 12 +-----
 4 files changed, 12 insertions(+), 116 deletions(-)

diff --git a/CssGradient.php b/CssGradient.php
index 197953c..414a651 100644
--- a/CssGradient.php
+++ b/CssGradient.php
@@ -201,5 +201,4 @@ private function toRgba($color) {
 
     }
 
-
 }
\ No newline at end of file
diff --git a/FieldtypeGrapick.module.php b/FieldtypeGrapick.module.php
index a36edf8..6c8458b 100644
--- a/FieldtypeGrapick.module.php
+++ b/FieldtypeGrapick.module.php
@@ -37,40 +37,6 @@ public function __construct() {
 		require_once(dirname(__FILE__) . '/CssGradient.php'); 
 	}
 
-
-	public function init() {
-	    $this->addHookAfter('ProcessPageEdit::buildFormContent', $this, 'setJsConfig');
-	}
-
-	public function setJsConfig($e) {
-		$form = $e->return;
-		$js_array = [];
-		foreach($form->children as $fc) {
-			$f_class = $fc->className;
-			switch($f_class) {
-				case 'InputfieldGrapick' :
-					$ctrl = $fc->name;
-					$js_array[$ctrl]['loaded'] = false;
-					break;
-				case 'InputfieldRepeater' :
-				case 'InputfieldRepeaterMatrix' :
-						foreach($fc->value as $enum => $it) {
-							$fg = $it->template->fieldgroup;
-							foreach($fg as $r_field) {
-								if($r_field->type == 'FieldtypeGrapick') {
-									$ctrl = $r_field->name.'_repeater'.$it->id;
-									$js_array[$ctrl]['loaded'] = false;
-								}
-							}
-						}
-					break;
-			}
-		}		
-		wire()->config->jsConfig('grapicks', $js_array);
-
-		//bd($inputfields);
-	}
-
 	/**
 	 * Return the Inputfield required by this Fieldtype
 	 * 
diff --git a/InputfieldGrapick.js b/InputfieldGrapick.js
index 8ebc910..fb17e94 100644
--- a/InputfieldGrapick.js
+++ b/InputfieldGrapick.js
@@ -177,33 +177,17 @@ function build_rule(ind) {
 var upType, unAngle, gp = [];
 const stopTxt = [], swType = [], swAngle = [], swOrigin = [], swSize = [];
 
-const pwConfig = ProcessWire.config.grapicks;
-
-console.log('pwConfig',pwConfig);
-
-function pollingRun() {
-	let done = true;
-	for (let key in pwConfig) {
-		if (pwConfig.hasOwnProperty(key)) {
-			if(pwConfig[key]['loaded'] == false) {
-				done = false;
-				let ctrl = document.getElementById(key+'_grapick_control');
-				//console.log(key, pwConfig[key], ctrl);
-				if(ctrl) {
-					createGrapick(key);
-				}
-				//console.log('Grapick field: ' + key);
-				for (let key2 in pwConfig[key]) {
-					//console.log('---->', key2, pwConfig[key][key2]);
-				}
-			}
-		}
-	}
-	if(done) {
-		//console.log('Done.');
-		clearInterval(poll);
-	}
-}
+$(document).ready(function() {
+	$('[id$="_grapick_control"]').each(function() {
+		field_name = this.id.replace('_grapick_control','');
+		createGrapick(field_name);
+	});
+});
+
+$(document).on('reloaded', '.InputfieldGrapick', function(event) {
+	field_name = $(event.currentTarget).find('.grapick').attr('id').replace('_grapick_control','');
+	createGrapick(field_name);
+});
 
 var createGrapick = function(key) {
 	gp[key] = new Grapick({
@@ -280,52 +264,9 @@ var createGrapick = function(key) {
 		build_rule(key);
 	})
 	gp[key].emit('change');
-	pwConfig[key]['loaded'] = true;
 };
 
 var destroyGrapick = function(key) {
 	gp[key].destroy();
 	gp[key] = 0;
 }
-
-document.addEventListener('DOMContentLoaded', pollingRun, false);
-
-var poll = setInterval(pollingRun, 1000);
-
-document.addEventListener('DOMContentLoaded', () => {
-
-	//Look for new grapick fields (to account for repeaters)
-
-	// select the target node
-	var target = document.getElementById('ProcessPageEdit');
-
-	// create an observer instance
-	var observer = new MutationObserver(function(mutations) {
-		mutations.forEach(function(mutation) {
-		var nodes = mutation.addedNodes;
-		var node;
-		for(var n = 0; node = nodes[n], n < nodes.length; n++) {
-			test_id = node.id;
-	        if(node.tagName == 'LI' && test_id.includes('repeater_item')) {
-				getGrapickControlNodes();
-			}
-		};
-		});
-	});
-
-	// configuration of the observer:
-	var config = { attributes: false, childList: true, subtree: true, characterData: false };
-
-	// pass in the target node, as well as the observer options
-	observer.observe(target, config);
-		
-}, false);
-
-function getGrapickControlNodes() {
-	const nodeSet = document.querySelectorAll('[id*="_grapick_control"]').forEach(item => {
-		keyName = item.id.substring(0,item.id.indexOf('_grapick_control'));
-		pwConfig[keyName] = {'loaded':true};
-		//console.log('post add',pwConfig);
-		createGrapick(keyName);
-	});
-}
diff --git a/InputfieldGrapick.module.php b/InputfieldGrapick.module.php
index 6fadb52..bd279aa 100644
--- a/InputfieldGrapick.module.php
+++ b/InputfieldGrapick.module.php
@@ -24,7 +24,7 @@ public static function getModuleInfo() {
 		return array(
 			'title' => "Grapick",
 			'summary' => 'Field that implements Grapick javascript gradient designer.',
-			'version' => '1.0.2',
+			'version' => '1.0.3',
 			'author' => 'Jacob Gorny',
 			'href' => 'https://github.com/solonmedia/FieldtypeGrapick',
 			'icon' => 'paint-brush',
@@ -123,13 +123,6 @@ public function renderReady(Inputfield $parent = null, $renderValueMode = false)
 			$config->styles->add($ms);
 		}
 
-		$this->config->js('InputfieldGrapick', [
-				'settings' => [
-					'test' => 'item',
-				],
-			],
-		);
-
 		return parent::renderReady($parent, $renderValueMode);
 	}
 
@@ -318,7 +311,6 @@ public function ___processInput(WireInputData $input) {
 			'size' => "{$name}_size"
 		);
 
-
         foreach($input_names as $key => $p_name) {
 
             if(!empty($input->$p_name) && isset($input->$p_name) && $gradient->$key != $input->$p_name) {
@@ -332,6 +324,4 @@ public function ___processInput(WireInputData $input) {
 		return $this;
 	}
 
-
-
 }