Merge branch 'development' into fix/feeds-import-cron

Codeinwp · Mar 4, 2024 · 553e74d · 553e74d
2 parents 92855c5 + fa82512
commit 553e74d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/includes/views/import-metabox-edit.php b/includes/views/import-metabox-edit.php
@@ -499,7 +499,7 @@ class="form-control fz-textarea-tagify"><?php echo esc_html( feedzy_custom_tag_e
 												</div>
 												<div class="help-text">
 													<?php
-														esc_html_e( 'You can use the magic tags, your own URL or leave it empty.', 'feedzy-rss-feeds' );
+														esc_html_e( 'You can use the magic tags, or leave it empty.', 'feedzy-rss-feeds' );
 													?>
 												</div>
 											</div>

diff --git a/includes/views/js/import-metabox-edit.js b/includes/views/js/import-metabox-edit.js
@@ -265,7 +265,7 @@
 		$( '.feedzy-keyword-filter, #feedzy-import-source' ).on('keyup keypress', function(e) {
 			var keyCode = e.keyCode || e.which;
 			var addTagBtn = $( this ).parents( '.fz-input-icon' ).find( '.add-outside-tags' );
-			
+
 			if ( '' === $( this ).val() ) {
 				addTagBtn.attr( 'disabled', true );
 			} else if ( addTagBtn.hasClass( 'fz-plus-btn' ) ) {
@@ -481,8 +481,8 @@
 		// Tagify for normal mix content field.
 		$( '.fz-tagify-image' ).tagify( {
 			mode: 'mix',
-			editTags: false,
-			userInput: false,
+			editTags: true,
+			userInput: true,
 			addTagOn: [],
 			templates: {
 				tag: function(tagData) {
@@ -836,4 +836,4 @@
 			$( '.feedzy-open-media' ).html( feedzy.i10n.action_btn_text_1 );
 		});
 	}
-})(jQuery, feedzy);
+}(jQuery, feedzy));