Merge pull request #7 from Bynder/improvement/grunt-building

🔨 Sorted being able to install npm and build grunt
Bynder · May 30, 2024 · e54fb4d · e54fb4d
2 parents 47b5254 + 36a3c06
commit e54fb4d
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 66 deletions.
diff --git a/assets/css/gathercontent-importer.min.css b/assets/css/gathercontent-importer.min.css
diff --git a/assets/css/sass/gathercontent-importer.scss b/assets/css/sass/gathercontent-importer.scss
@@ -185,14 +185,14 @@ ul.gc-radio-desc li, ul.gc-reveal-items-list li {
 			&.text{
 				option[data-type="text"],
 				option[data-type="textarea"],
-				option[data-type="wysiwyg"]{ 
+				option[data-type="wysiwyg"]{
 					display:block;
 				}
 			}
 			&.attachment{
 				option[data-type="gallery"],
-				option[data-type="image"]{ 
-					display:block; 
+				option[data-type="image"]{
+					display:block;
 				}
 			}
 			&.choice_checkbox{
@@ -204,14 +204,14 @@ ul.gc-radio-desc li, ul.gc-reveal-items-list li {
 			&.repeater{
 				option[data-type="text"],
 				option[data-type="textarea"],
-				option[data-type="wysiwyg"]{ 
+				option[data-type="wysiwyg"]{
 					display:none;
 				}
 				option[data-type="repeater"]{ display:block; }
 			}
 		}
 	}
-	
+
 	.ajax-disabled{
 		opacity:0.75;
 		pointer-events:none;
@@ -391,6 +391,11 @@ ul.gc-radio-desc li, ul.gc-reveal-items-list li {
 	background-color: #f5bfbf;
 }
 
+.gc-component-disabled {
+	pointer-events: none;
+	opacity: 0.5;
+}
+
 @import 'sync';
 @import 'modal';
 @import 'single';
diff --git a/assets/js/gathercontent-general.js b/assets/js/gathercontent-general.js
@@ -1,8 +1,8 @@
 /**
- * Content Workflow Plugin - v1.0.0 - 2024-05-03
- * http://www.gathercontent.com
+ * Content Workflow (by Bynder) - v1.0.0 - 2024-05-29
+ * 
  *
- * Copyright (c) 2024 Bynder
+ * Copyright (c) 2024 Content Workflow (by Bynder)
  * Licensed under the GPLv2 license.
  */
 

diff --git a/assets/js/gathercontent-general.min.js b/assets/js/gathercontent-general.min.js
diff --git a/assets/js/gathercontent-mapping.js b/assets/js/gathercontent-mapping.js
@@ -1,8 +1,8 @@
 /**
- * Content Workflow Plugin - v1.0.0 - 2024-05-03
- * http://www.gathercontent.com
+ * Content Workflow (by Bynder) - v1.0.0 - 2024-05-29
+ * 
  *
- * Copyright (c) 2024 GatherContent
+ * Copyright (c) 2024 Content Workflow (by Bynder)
  * Licensed under the GPLv2 license.
  */
 
@@ -452,6 +452,7 @@ module.exports = function (app, _meta_keys) {
    * 2nd Dropdown - event change
    */
 		changeValue: function changeValue(evt) {
+			var component = jQuery(evt.target).closest('.component-table-wrapper').attr('id');
 			var value = jQuery(evt.target).val();
 			var type = this.model.get('type');
 			var fieldType = this.model.get('field_type');
@@ -465,7 +466,6 @@ module.exports = function (app, _meta_keys) {
 				this.model.set('field_value', value);
 				// Components - Update "Field"
 				if ("component" === type) {
-					var component = jQuery(evt.target).closest('.component-table-wrapper').attr('id');
 					this.updateAjax_Field(component, value, false);
 				}
 				// Repeaters - Update "Field"
@@ -523,7 +523,7 @@ module.exports = function (app, _meta_keys) {
    * AJAX Update: "Field" - ACF Field group's field
    * - "Field" refers to the 3rd dropdown of the component fields top level
    * - After selecting the field group from the 2nd dropdown, call WP_AJAX to get the relevent fields from the group selected and populate the 3rd dropdown (aka "Field")
-   * 
+   *
    * @param {string} component - ID without the "#" of the component parent row
    * @param {string} field_name - Parent field name/key of the sub fields, should be a repeater
    * @param {object} saved_fields - OPTIONAL: Pass saved subfields if you want to set pre-existing values
@@ -570,7 +570,7 @@ module.exports = function (app, _meta_keys) {
    * AJAX Update: "Subfields" - ACF Field group's repeater subfields
    * - "Subfields" are in the component accordion
    * - After selecting the field group from the 3rd dropdown, call WP_AJAX to get the relevent subfields from the ACF Repeater selected and populate the subfields
-   * 
+   *
    * @param {string} component - ID without the "#" of the component parent row
    * @param {string} field_name - Parent field name/key of the sub fields, should be a repeater
    * @param {object} saved_fields - OPTIONAL: Pass saved subfields if you want to set pre-existing values

diff --git a/assets/js/gathercontent-mapping.min.js b/assets/js/gathercontent-mapping.min.js
diff --git a/assets/js/gathercontent-single.js b/assets/js/gathercontent-single.js
@@ -1,8 +1,8 @@
 /**
- * Content Workflow Plugin - v1.0.0 - 2024-05-03
- * http://www.gathercontent.com
+ * Content Workflow (by Bynder) - v1.0.0 - 2024-05-29
+ * 
  *
- * Copyright (c) 2024 GatherContent
+ * Copyright (c) 2024 Content Workflow (by Bynder)
  * Licensed under the GPLv2 license.
  */
 

diff --git a/assets/js/gathercontent-single.min.js b/assets/js/gathercontent-single.min.js
diff --git a/assets/js/gathercontent-sync.js b/assets/js/gathercontent-sync.js
@@ -1,8 +1,8 @@
 /**
- * Content Workflow Plugin - v1.0.0 - 2024-05-03
- * http://www.gathercontent.com
+ * Content Workflow (by Bynder) - v1.0.0 - 2024-05-29
+ * 
  *
- * Copyright (c) 2024 GatherContent
+ * Copyright (c) 2024 Content Workflow (by Bynder)
  * Licensed under the GPLv2 license.
  */
 

diff --git a/assets/js/gathercontent-sync.min.js b/assets/js/gathercontent-sync.min.js
diff --git a/assets/js/gathercontent.js b/assets/js/gathercontent.js
@@ -1,8 +1,8 @@
 /**
- * Content Workflow Plugin - v1.0.0 - 2024-05-03
- * http://www.gathercontent.com
+ * Content Workflow (by Bynder) - v1.0.0 - 2024-05-29
+ * 
  *
- * Copyright (c) 2024 GatherContent
+ * Copyright (c) 2024 Content Workflow (by Bynder)
  * Licensed under the GPLv2 license.
  */
 

diff --git a/assets/js/gathercontent.min.js b/assets/js/gathercontent.min.js
diff --git a/assets/js/src/components/views/tab-row.js b/assets/js/src/components/views/tab-row.js
@@ -50,6 +50,7 @@ module.exports = function( app, _meta_keys ) {
 		 * 2nd Dropdown - event change
 		 */
 		changeValue: function( evt ) {
+			var component = jQuery( evt.target ).closest('.component-table-wrapper').attr('id');
 			var value = jQuery( evt.target ).val();
 			var type = this.model.get( 'type' );
 			var fieldType = this.model.get( 'field_type' );
@@ -58,19 +59,18 @@ module.exports = function( app, _meta_keys ) {
 				this.model.set( 'field_value', '' );
 				this.model.set( 'field_field', '' );
 				this.model.set( 'field_subfields', {} );
-				jQuery('#'+component+' .component-table-inner ').find('select').html("<option value=''>Unused</option>").val(""); 
+				jQuery('#'+component+' .component-table-inner ').find('select').html("<option value=''>Unused</option>").val("");
 			} else {
 				this.model.set( 'field_value', value );
 				// Components - Update "Field"
 				if( "component" === type ){
-					var component = jQuery( evt.target ).closest('.component-table-wrapper').attr('id');
 					this.updateAjax_Field(component, value, false);
 				}
 				// Repeaters - Update "Field"
 				else if( "wp-type-acf" === fieldType ){
 					var id = jQuery( evt.target ).closest('td').attr('id');
 					this.updateAjax_Field(id, value, false);
-				}	
+				}
 			}
 		},
 
@@ -84,7 +84,7 @@ module.exports = function( app, _meta_keys ) {
 			this.model.set( 'field_subfields', {} );
 			if ( '' === value ) {
 				this.model.set( 'field_field', '' );
-				jQuery('#'+component+' .component-table-inner ').find('select').html("<option value=''>Unused</option>").val(""); 
+				jQuery('#'+component+' .component-table-inner ').find('select').html("<option value=''>Unused</option>").val("");
 			} else {
 				this.model.set( 'field_field', value );
 				// Update subfields
@@ -111,15 +111,15 @@ module.exports = function( app, _meta_keys ) {
 			var options_html = "<option value=''>Unused</option>";
 			jQuery.each(data.field_data, function(i, field) {
 				options_html += "<option class='hidden' value='"+field.key+"' data-type='"+field.type+"'>"+field.label+"</option>";
-			}); 
+			});
 			return options_html;
 		},
 
 		/**
 		 * AJAX Update: "Field" - ACF Field group's field
 		 * - "Field" refers to the 3rd dropdown of the component fields top level
 		 * - After selecting the field group from the 2nd dropdown, call WP_AJAX to get the relevent fields from the group selected and populate the 3rd dropdown (aka "Field")
-		 * 
+		 *
 		 * @param {string} component - ID without the "#" of the component parent row
 		 * @param {string} field_name - Parent field name/key of the sub fields, should be a repeater
 		 * @param {object} saved_fields - OPTIONAL: Pass saved subfields if you want to set pre-existing values
@@ -166,7 +166,7 @@ module.exports = function( app, _meta_keys ) {
 		 * AJAX Update: "Subfields" - ACF Field group's repeater subfields
 		 * - "Subfields" are in the component accordion
 		 * - After selecting the field group from the 3rd dropdown, call WP_AJAX to get the relevent subfields from the ACF Repeater selected and populate the subfields
-		 * 
+		 *
 		 * @param {string} component - ID without the "#" of the component parent row
 		 * @param {string} field_name - Parent field name/key of the sub fields, should be a repeater
 		 * @param {object} saved_fields - OPTIONAL: Pass saved subfields if you want to set pre-existing values

diff --git a/includes/classes/admin/mapping-wizard.php b/includes/classes/admin/mapping-wizard.php
@@ -541,15 +541,6 @@ public function map_template() {
 				array('additionalClass' => 'gc-component-disabled'),
 				false
 			);
-
-			?>
-				<style>
-					.gc-component-disabled {
-						pointer-events: none;
-						opacity: 0.5;
-					}
-				</style>
-			<?php
 		}
 
 		if ( ! $sync_items && $mapping_id ) {

diff --git a/package.json b/package.json
@@ -4,6 +4,9 @@
   "description": "Imports items from Content Workflow to your wordpress site",
   "version": "1.0.0",
   "license": "GPLv2",
+  "scripts": {
+    "build": "grunt build"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Bynder/cw-wordpress-plugin"
@@ -14,7 +17,7 @@
     "url": "https://www.bynder.com/products/content-workflow/"
   },
   "engines": {
-    "node": ">=14.0.0 <15.0.0"
+    "node": ">=14.0.0 <16.20.3"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
@@ -23,24 +26,19 @@
     "browserify-shim": "^3.8.14",
     "chai": "^3.5.0",
     "glob": "~5.0.15",
-    "grunt": "^1.4.1",
+    "grunt": "^1.6.1",
     "grunt-browserify": "^4.0.1",
-    "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-compress": "^2.0.0",
-    "grunt-contrib-concat": "^0.5.1",
-    "grunt-contrib-copy": "^0.8.0",
-    "grunt-contrib-cssmin": "^0.12.3",
-    "grunt-contrib-jshint": "^0.11.2",
-    "grunt-contrib-uglify": "^0.9.1",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-mocha": "^1.0.4",
-    "grunt-phpunit": "^0.3.6",
-    "grunt-postcss": "^0.6.0",
     "grunt-sass": "^3.1.0",
+    "grunt-postcss": "^0.9.0",
+    "grunt-contrib-jshint": "^3.2.0",
+    "grunt-contrib-uglify": "^5.2.2",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-cssmin": "^5.0.0",
     "grunt-wp-readme-to-markdown": "^0.9.0",
     "load-grunt-config": "~0.17.2",
     "load-grunt-tasks": "^3.5.2",
-    "node-sass": "^6.0.1"
+    "node-sass": "^9.0.0"
   },
   "browserify-shim": {
     "jquery": "global:jQuery"

diff --git a/tasks/options/uglify.js b/tasks/options/uglify.js
@@ -13,9 +13,9 @@ module.exports = {
 			' | Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>' +
 			' | Licensed <%= pkg.license %>' +
 			' */\n',
-			mangle: {
-				except: ['jQuery']
-			}
+			// mangle: {
+			// 	except: ['jQuery']
+			// }
 		}
 	}
 };