Making multi media field pretty + some core improvements

Author: Tofandel

plugins/redux-extensions/multi_media/multi_media/field_multi_media.js

@@ -156,7 +156,6 @@
 
 		// Make form field ID
 		var $formfield = $('#' + inputID);
-		console.log(inputID);
 
 		// Get form name
 		var formName = $formfield.attr('name');
@@ -248,12 +247,12 @@
 
 					// Handle images
 					if (this.type && this.type === 'image') {
-
+						var url = 'thumbnail' in this.sizes ? this.sizes.thumbnail.url : this.url;
 						// image preview
 						uploadStatus =
 							'<li class="img_status">' +
-							'<img width="50" height="50" src="' + this.url + '" class="attachment-50x50" alt="' + this.filename + '">' +
-							'<p><a href="#" class="redux_remove_file_button" rel="' + inputID + '[' + this.id + ']">' + l10n.remove_image + '</a></p>' +
+							'<img src="' + url + '" class="redux-option-image" alt="' + this.filename + '">' +
+							'<p><a href="#" class="button remove-image redux_remove_file_button" rel="' + inputID + '[' + this.id + ']">' + l10n.remove_image + '</a></p>' +
 							'<input type="hidden" id="filelist-' + this.id + '" name="' + formName + '[' + this.id + ']" value="' + this.url + '">' +
 							'</li>';
 

plugins/redux-extensions/multi_media/multi_media/field_multi_media.min.js

@@ -169,12 +169,11 @@ class=""
 
 					// Check for valud image extension
 					if ( $this->is_valid_img_ext( $url ) ) {
-
 						// Add image to array
 						$imgArr[] =
 							'<li class="img_status">' .
-							wp_get_attachment_image( $id, array( 50, 50 ) ) .
-							'<p class="redux_remove_wrapper"><a href="#" class="redux_remove_file_button">' . __( 'Remove Image', 'redux-framework' ) . '</a></p>
+							wp_get_attachment_image( $id, 'thumbnail', false, array( 'class' => 'redux-option-image' ) ) .
+							'<p class="redux_remove_wrapper"><a href="#" class="button remove-image redux_remove_file_button">' . __( 'Remove Image', 'redux-framework' ) . '</a></p>
                             ' . $id_input . '
                         </li>';
 

plugins/redux-extensions/multi_media/multi_media/field_multi_media.php

@@ -201,20 +201,20 @@ function redux_store_answer(input, nonce) {
 									allow_tracking: input,
 									nonce: nonce
 								};
-								jQuery.post(
+								$.post(
 									ajaxurl, redux_tracking_data, function () {
-										jQuery('#wp-pointer-0').remove();
+										$('#wp-pointer-0').remove();
 									}
 								);
 							}
 
 							redux_pointer_options = $.extend(
 								redux_pointer_options, {
 									buttons: function (event, t) {
-										button = jQuery('<a id="pointer-close" style="margin-left:5px" class="button-secondary">' + '<?php echo $button1; ?>' + '</a>');
-										button.bind(
-											'click.pointer', function () {
+										button = $('<a id="pointer-close" style="margin-left:5px" class="button-secondary">' + '<?php echo $button1; ?>' + '</a>');
+										button.on('click', function () {
 												t.element.pointer('close');
+											//todo SEND ajax request
 												//console.log( 'close button' );
 											}
 										);
@@ -228,13 +228,13 @@ function redux_store_answer(input, nonce) {
 							setup = function () {
 								$('<?php echo $selector; ?>').pointer(redux_pointer_options).pointer('open');
 								<?php if ($button2) { ?>
-								jQuery('#pointer-close').after('<a id="pointer-primary" class="button-primary">' + '<?php echo $button2; ?>' + '</a>');
-								jQuery('#pointer-primary').click(
+								$('#pointer-close').after('<a id="pointer-primary" class="button-primary">' + '<?php echo $button2; ?>' + '</a>');
+								$('#pointer-primary').click(
 									function () {
 										<?php echo $button2_function; ?>
 									}
 								);
-								jQuery('#pointer-close').click(
+								$('#pointer-close').click(
 									function () {
 										<?php if ($button1_function == '') { ?>
 										redux_store_answer(input, nonce);
@@ -245,7 +245,7 @@ function () {
 									}
 								);
 								<?php } else if ($button1 && ! $button2) { ?>
-								jQuery('#pointer-close').click(
+								$('#pointer-close').click(
 									function () {
 										<?php if ($button1_function != '') { ?>
 										<?php echo $button1_function; ?>
@@ -256,7 +256,7 @@ function () {
 							};
 
 							if (redux_pointer_options.position && redux_pointer_options.position.defer_loading)
-								$(window).bind('load.wp-pointers', setup);
+								$(window).on('load.wp-pointers', setup);
 							else
 								$(document).ready(setup);
 						}

plugins/redux-framework/ReduxCore/inc/tracking.php

@@ -30,6 +30,8 @@ class ReduxFramework implements SubModule {
 	private $metabox;
 
 	public function __construct( WP_Plugin &$parent = null ) {
+		ReduxConfig::loadRedux();
+
 		$this->ParentConstruct( $parent );
 		if ( $parent ) {
 			$this->opt_name = $parent->getReduxOptName();

src/Modules/ReduxFramework.php

@@ -67,7 +67,7 @@ public static function hide_redux_plugin() {
 	public static function loadRedux() {
 		if ( ! class_exists( Redux::class, false ) ) {
 			global $WPlusPlusCore;
-			if ( file_exists( $f = $WPlusPlusCore->file( 'plugins/redux-framework/redux-framework.php' ) ) ) {
+			if ( file_exists( $f = $WPlusPlusCore->file( 'plugins/redux-dev/redux-framework.php' ) ) ) {
 				require_once $f;
 			}
 		}

src/Objects/ReduxConfig.php

@@ -37,13 +37,13 @@ public function __construct( $action, $func, $private = false, $referer = null )
 		add_action( 'wp_ajax_' . $action, [ $this, 'call' ], 10, 0 );
 		if ( ! $private ) {
 			add_action( 'wp_ajax_nopriv_' . $action, [ $this, 'call' ], 10, 0 );
-		} else {
-			if ( $referer == true ) {
-				$referer = $action;
-			}
-			$this->referer = $referer;
 		}
 
+		if ( $referer == true ) {
+			$referer = $action;
+		}
+		$this->referer = $referer;
+
 		$this->action = $action;
 
 		$this->func = $func;

src/Objects/WP_Ajax.php

@@ -112,7 +112,7 @@ public function initShortcodes() {
 	}
 
 	/**
-	 * @param SubModule $submodule
+	 * @param string|SubModule $submodule
 	 */
 	public function setSubModule( $submodule ) {
 		if ( $submodule instanceof SubModule ) {
@@ -122,6 +122,8 @@ public function setSubModule( $submodule ) {
 			} catch ( \ReflectionException $exception ) {
 				error_log( $exception->getMessage() );
 			}
+		} elseif ( is_string( $submodule ) ) {
+			$this->modules[ $submodule ] = new $submodule( $this );
 		}
 	}