AyeCode / invoicing

includes/wpinv-invoice-functions.php

Indentation +63 added lines, -63 removed lines

@@ -669,7 +669,7 @@ 
 }
 
 function wpinv_get_payment_key( $invoice_id = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice( $invoice_id );
     return $invoice->get_key();
 }
 
@@ -919,7 +919,7 @@ 
         return false;
     }
     $invoice = wpinv_get_invoice_cart();
-	if ( empty( $invoice ) ) {
+    if ( empty( $invoice ) ) {
         return false;
     }
 
@@ -1212,20 +1212,20 @@ 
 }
 
 function wpinv_checkout_get_cc_info() {
-	$cc_info = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
-	$cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
-	$cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
-	$cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
-
-	// Return cc info
-	return $cc_info;
+    $cc_info = array();
+    $cc_info['card_name']      = isset( $_POST['card_name'] )       ? sanitize_text_field( $_POST['card_name'] )       : '';
+    $cc_info['card_number']    = isset( $_POST['card_number'] )     ? sanitize_text_field( $_POST['card_number'] )     : '';
+    $cc_info['card_cvc']       = isset( $_POST['card_cvc'] )        ? sanitize_text_field( $_POST['card_cvc'] )        : '';
+    $cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] )  ? sanitize_text_field( $_POST['card_exp_month'] )  : '';
+    $cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] )   ? sanitize_text_field( $_POST['card_exp_year'] )   : '';
+    $cc_info['card_address']   = isset( $_POST['wpinv_address'] )  ? sanitize_text_field( $_POST['wpinv_address'] ) : '';
+    $cc_info['card_city']      = isset( $_POST['wpinv_city'] )     ? sanitize_text_field( $_POST['wpinv_city'] )    : '';
+    $cc_info['card_state']     = isset( $_POST['wpinv_state'] )    ? sanitize_text_field( $_POST['wpinv_state'] )   : '';
+    $cc_info['card_country']   = isset( $_POST['wpinv_country'] )  ? sanitize_text_field( $_POST['wpinv_country'] ) : '';
+    $cc_info['card_zip']       = isset( $_POST['wpinv_zip'] )      ? sanitize_text_field( $_POST['wpinv_zip'] )     : '';
+
+    // Return cc info
+    return $cc_info;
 }
 
 function wpinv_checkout_validate_cc_zip( $zip = 0, $country_code = '' ) {
@@ -1422,7 +1422,7 @@ 
         $required_fields  = wpinv_checkout_required_fields();
 
         // Loop through required fields and show error messages
-         if ( !empty( $required_fields ) ) {
+            if ( !empty( $required_fields ) ) {
             foreach ( $required_fields as $field_name => $value ) {
                 if ( in_array( $value, $required_fields ) && empty( $_POST[ 'wpinv_' . $field_name ] ) ) {
                     wpinv_set_error( $value['error_id'], $value['error_message'] );
@@ -1528,7 +1528,7 @@ 
 }
 
 function wpinv_get_checkout_session() {
-	global $wpi_session;
+    global $wpi_session;
     
     return $wpi_session->get( 'wpinv_checkout' );
 }
@@ -1891,57 +1891,57 @@ 
 }
 
 function wpinv_get_invoice_id_by_key( $key ) {
-	global $wpdb;
+    global $wpdb;
 
-	$invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
+    $invoice_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wpinv_key' AND meta_value = %s LIMIT 1", $key ) );
 
-	if ( $invoice_id != NULL )
-		return $invoice_id;
+    if ( $invoice_id != NULL )
+        return $invoice_id;
 
-	return 0;
+    return 0;
 }
 
 function wpinv_can_view_receipt( $invoice_key = '' ) {
-	$return = false;
-
-	if ( empty( $invoice_key ) ) {
-		return $return;
-	}
-
-	global $wpinv_receipt_args;
-
-	$wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
-	if ( isset( $_GET['invoice-id'] ) ) {
-		$wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
-	}
-
-	if ( empty( $wpinv_receipt_args['id'] ) ) {
-		return $return;
-	}
-
-	$invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
-	if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
-		return $return;
-	}
-
-	if ( is_user_logged_in() ) {
-		if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
-			$return = true;
-		}
-	}
-
-	$session = wpinv_get_checkout_session();
-	if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
-		$check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
-
-		if ( wpinv_require_login_to_checkout() ) {
-			$return = $return && $check_key === $invoice_key;
-		} else {
-			$return = $check_key === $invoice_key;
-		}
-	}
-
-	return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
+    $return = false;
+
+    if ( empty( $invoice_key ) ) {
+        return $return;
+    }
+
+    global $wpinv_receipt_args;
+
+    $wpinv_receipt_args['id'] = wpinv_get_invoice_id_by_key( $invoice_key );
+    if ( isset( $_GET['invoice-id'] ) ) {
+        $wpinv_receipt_args['id'] = $invoice_key == wpinv_get_payment_key( (int)$_GET['invoice-id'] ) ? (int)$_GET['invoice-id'] : 0;
+    }
+
+    if ( empty( $wpinv_receipt_args['id'] ) ) {
+        return $return;
+    }
+
+    $invoice = wpinv_get_invoice( $wpinv_receipt_args['id'] );
+    if ( !( !empty( $invoice->ID ) && $invoice->get_key() === $invoice_key ) ) {
+        return $return;
+    }
+
+    if ( is_user_logged_in() ) {
+        if ( (int)$invoice->get_user_id() === (int) get_current_user_id() ) {
+            $return = true;
+        }
+    }
+
+    $session = wpinv_get_checkout_session();
+    if ( isset( $_GET['invoice_key'] ) || ( $session && isset( $session['invoice_key'] ) ) ) {
+        $check_key = isset( $_GET['invoice_key'] ) ? $_GET['invoice_key'] : $session['invoice_key'];
+
+        if ( wpinv_require_login_to_checkout() ) {
+            $return = $return && $check_key === $invoice_key;
+        } else {
+            $return = $check_key === $invoice_key;
+        }
+    }
+
+    return (bool) apply_filters( 'wpinv_can_view_receipt', $return, $invoice_key );
 }
 
 function wpinv_pay_for_invoice() {

includes/class-wpinv-privacy.php

Indentation +21 added lines, -21 removed lines

@@ -31,27 +31,27 @@
     public function get_privacy_message() {
 
         $content = '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
-                   '<div contenteditable="false">' .
-                   '<p class="wp-policy-help">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
-                   '</div>' .
-                   '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
-                   '<ul>' .
-                   '<li>' . __( '- Send you important account/order/service information.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '</ul>' .
-                   '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
-                   '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
-                   '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
-                   '<div contenteditable="false">' .
-                   '<p class="wp-policy-help">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
-                   '</div>' .
-                   '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>';
+                    '<div contenteditable="false">' .
+                    '<p class="wp-policy-help">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
+                    '</div>' .
+                    '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
+                    '<ul>' .
+                    '<li>' . __( '- Send you important account/order/service information.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                    '</ul>' .
+                    '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
+                    '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
+                    '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
+                    '<div contenteditable="false">' .
+                    '<p class="wp-policy-help">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
+                    '</div>' .
+                    '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>';
 
 
 

vendor/composer/installers/src/Composer/Installers/OxidInstaller.php

Indentation +41 added lines, -41 removed lines

@@ -5,7 +5,7 @@ 
 
 class OxidInstaller extends BaseInstaller
 {
-	const VENDOR_PATTERN = '/^modules\/(?P<vendor>.+)\/.+/';
+    const VENDOR_PATTERN = '/^modules\/(?P<vendor>.+)\/.+/';
 
     protected $locations = array(
         'module'    => 'modules/{$name}/',
@@ -13,47 +13,47 @@ 
         'out'    => 'out/{$name}/',
     );
 
-	/**
-	 * getInstallPath
-	 *
-	 * @param PackageInterface $package
-	 * @param string $frameworkType
-	 * @return void
-	 */
-	public function getInstallPath(PackageInterface $package, $frameworkType = '')
-	{
-		$installPath = parent::getInstallPath($package, $frameworkType);
-		$type = $this->package->getType();
-		if ($type === 'oxid-module') {
-			$this->prepareVendorDirectory($installPath);
-		}
-		return $installPath;
-	}
+    /**
+     * getInstallPath
+     *
+     * @param PackageInterface $package
+     * @param string $frameworkType
+     * @return void
+     */
+    public function getInstallPath(PackageInterface $package, $frameworkType = '')
+    {
+        $installPath = parent::getInstallPath($package, $frameworkType);
+        $type = $this->package->getType();
+        if ($type === 'oxid-module') {
+            $this->prepareVendorDirectory($installPath);
+        }
+        return $installPath;
+    }
 
-	/**
-	 * prepareVendorDirectory
-	 *
-	 * Makes sure there is a vendormetadata.php file inside
-	 * the vendor folder if there is a vendor folder.
-	 *
-	 * @param string $installPath
-	 * @return void
-	 */
-	protected function prepareVendorDirectory($installPath)
-	{
-		$matches = '';
-		$hasVendorDirectory = preg_match(self::VENDOR_PATTERN, $installPath, $matches);
-		if (!$hasVendorDirectory) {
-			return;
-		}
+    /**
+     * prepareVendorDirectory
+     *
+     * Makes sure there is a vendormetadata.php file inside
+     * the vendor folder if there is a vendor folder.
+     *
+     * @param string $installPath
+     * @return void
+     */
+    protected function prepareVendorDirectory($installPath)
+    {
+        $matches = '';
+        $hasVendorDirectory = preg_match(self::VENDOR_PATTERN, $installPath, $matches);
+        if (!$hasVendorDirectory) {
+            return;
+        }
 
-		$vendorDirectory = $matches['vendor'];
-		$vendorPath = getcwd() . '/modules/' . $vendorDirectory;
-		if (!file_exists($vendorPath)) {
-			mkdir($vendorPath, 0755, true);
-		}
+        $vendorDirectory = $matches['vendor'];
+        $vendorPath = getcwd() . '/modules/' . $vendorDirectory;
+        if (!file_exists($vendorPath)) {
+            mkdir($vendorPath, 0755, true);
+        }
 
-		$vendorMetaDataPath = $vendorPath . '/vendormetadata.php';
-		touch($vendorMetaDataPath);
-	}
+        $vendorMetaDataPath = $vendorPath . '/vendormetadata.php';
+        touch($vendorMetaDataPath);
+    }
 }

vendor/composer/installers/src/Composer/Installers/ClanCatsFrameworkInstaller.php

Indentation +4 added lines, -4 removed lines

@@ -3,8 +3,8 @@
 
 class ClanCatsFrameworkInstaller extends BaseInstaller
 {
-	protected $locations = array(
-		'ship'      => 'CCF/orbit/{$name}/',
-		'theme'     => 'CCF/app/themes/{$name}/',
-	);
+    protected $locations = array(
+        'ship'      => 'CCF/orbit/{$name}/',
+        'theme'     => 'CCF/app/themes/{$name}/',
+    );
 }
\ No newline at end of file

vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php

Indentation +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@
         'library'   => 'libraries/{$name}/',
         'profile'   => 'profiles/{$name}/',
         'drush'     => 'drush/{$name}/',
-	    'custom-theme' => 'themes/custom/{$name}/',
-	    'custom-module' => 'modules/custom/{$name}/',
+        'custom-theme' => 'themes/custom/{$name}/',
+        'custom-module' => 'modules/custom/{$name}/',
     );
 }

vendor/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php

Indentation +353 added lines, -353 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,285 +21,285 @@ 
  */
 if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class WP_Font_Awesome_Settings
-	 * @since 1.0.10 Now able to pass wp.org theme check.
-	 * @ver 1.0.10
-	 * @todo decide how to implement textdomain
-	 */
-	class WP_Font_Awesome_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '1.0.10';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'font-awesome-settings';
-
-		/**
-		 * Latest version of Font Awesome at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "5.6.1";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'Font Awesome';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * WP_Font_Awesome_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    WP_Font_Awesome_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-		/**
-		 * Main WP_Font_Awesome_Settings Instance.
-		 *
-		 * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return WP_Font_Awesome_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
-				self::$instance = new WP_Font_Awesome_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-				}
-
-				do_action( 'wp_font_awesome_settings_loaded' );
-			}
-
-			return self::$instance;
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 *
-		 * @since 1.0.8 Settings name wrong - FIXED
-		 */
-		public function init() {
-			$this->settings = $this->get_settings();
-
-			if ( $this->settings['type'] == 'CSS' ) {
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );//echo '###';exit;
-				}
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-				}
-
-			} else {
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );//echo '###';exit;
-				}
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-				}
-			}
-
-			// remove font awesome if set to do so
-			if ( $this->settings['dequeue'] == '1' ) {
-				add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
-			}
-
-		}
-
-		/**
-		 * Adds the Font Awesome styles.
-		 */
-		public function enqueue_style() {
-			// build url
-			$url = $this->get_url();
-
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), null );
-			wp_enqueue_style( 'font-awesome' );
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_style( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
-			// build url
-			$url = $this->get_url();
-
-			$deregister_function = 'wp'.'_'.'deregister'.'_'.'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Get the url of the Font Awesome files.
-		 *
-		 * @param bool $shims If this is a shim file or not.
-		 *
-		 * @return string The url to the file.
-		 */
-		public function get_url( $shims = false ) {
-			$script  = $shims ? 'v4-shims' : 'all';
-			$type    = $this->settings['type'];
-			$version = $this->settings['version'];
-
-			$url = "https://use.fontawesome.com/releases/"; // CDN
-			$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
-			$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
-			$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
-			$url .= "?wpfas=true"; // set our var so our version is not removed
-
-			return $url;
-		}
-
-		/**
-		 * Try and remove any other versions of Font Awesome added by other plugins/themes.
-		 *
-		 * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
-		 *
-		 * @param $url
-		 * @param $original_url
-		 * @param $_context
-		 *
-		 * @return string The filtered url.
-		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
-
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
-			) {// it's a font-awesome-url (probably)
-
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
-							$url .= "' data-search-pseudo-elements defer='defer";
-						} else {
-							$url .= "' defer='defer";
-						}
-					}
-				} else {
-					$url = ''; // removing the url removes the file
-				}
-
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add'.'_'.'options'.'_'.'page'; // won't pass theme check if function name present in theme
-			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-
-			$db_settings = get_option( 'wp-font-awesome-settings' );
-
-			$defaults = array(
-				'type'      => 'CSS', // type to use, CSS or JS
-				'version'   => '', // latest
-				'enqueue'   => '', // front and backend
-				'shims'     => '1', // default on for now, @todo maybe change to off in 2020
-				'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
-				'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
-			);
-
-			$settings = wp_parse_args( $db_settings, $defaults );
-
-			/**
-			 * Filter the Font Awesome settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
-		}
-
-
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
-			}
-
-			// a hidden way to force the update of the verison number vai api instead of waiting the 48 hours
-			if(isset($_REQUEST['force-version-check'])){
-				$this->get_latest_version($force_api = true);
-			}
-			?>
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class WP_Font_Awesome_Settings
+     * @since 1.0.10 Now able to pass wp.org theme check.
+     * @ver 1.0.10
+     * @todo decide how to implement textdomain
+     */
+    class WP_Font_Awesome_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '1.0.10';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'font-awesome-settings';
+
+        /**
+         * Latest version of Font Awesome at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "5.6.1";
+
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'Font Awesome';
+
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
+
+        /**
+         * WP_Font_Awesome_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    WP_Font_Awesome_Settings There can be only one!
+         */
+        private static $instance = null;
+
+        /**
+         * Main WP_Font_Awesome_Settings Instance.
+         *
+         * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return WP_Font_Awesome_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+                self::$instance = new WP_Font_Awesome_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+                }
+
+                do_action( 'wp_font_awesome_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         *
+         * @since 1.0.8 Settings name wrong - FIXED
+         */
+        public function init() {
+            $this->settings = $this->get_settings();
+
+            if ( $this->settings['type'] == 'CSS' ) {
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );//echo '###';exit;
+                }
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                }
+
+            } else {
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );//echo '###';exit;
+                }
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                }
+            }
+
+            // remove font awesome if set to do so
+            if ( $this->settings['dequeue'] == '1' ) {
+                add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+            }
+
+        }
+
+        /**
+         * Adds the Font Awesome styles.
+         */
+        public function enqueue_style() {
+            // build url
+            $url = $this->get_url();
+
+            wp_deregister_style( 'font-awesome' ); // deregister in case its already there
+            wp_register_style( 'font-awesome', $url, array(), null );
+            wp_enqueue_style( 'font-awesome' );
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_style( 'font-awesome-shims', $url, array(), null );
+                wp_enqueue_style( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
+            // build url
+            $url = $this->get_url();
+
+            $deregister_function = 'wp'.'_'.'deregister'.'_'.'script';
+            call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
+            wp_register_script( 'font-awesome', $url, array(), null );
+            wp_enqueue_script( 'font-awesome' );
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_script( 'font-awesome-shims', $url, array(), null );
+                wp_enqueue_script( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Get the url of the Font Awesome files.
+         *
+         * @param bool $shims If this is a shim file or not.
+         *
+         * @return string The url to the file.
+         */
+        public function get_url( $shims = false ) {
+            $script  = $shims ? 'v4-shims' : 'all';
+            $type    = $this->settings['type'];
+            $version = $this->settings['version'];
+
+            $url = "https://use.fontawesome.com/releases/"; // CDN
+            $url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+            $url .= $type == 'CSS' ? 'css/' : 'js/'; // type
+            $url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
+            $url .= "?wpfas=true"; // set our var so our version is not removed
+
+            return $url;
+        }
+
+        /**
+         * Try and remove any other versions of Font Awesome added by other plugins/themes.
+         *
+         * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
+         *
+         * @param $url
+         * @param $original_url
+         * @param $_context
+         *
+         * @return string The filtered url.
+         */
+        public function remove_font_awesome( $url, $original_url, $_context ) {
+
+            if ( $_context == 'display'
+                 && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
+                 && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+            ) {// it's a font-awesome-url (probably)
+
+                if ( strstr( $url, "wpfas=true" ) !== false ) {
+                    if ( $this->settings['type'] == 'JS' ) {
+                        if ( $this->settings['js-pseudo'] ) {
+                            $url .= "' data-search-pseudo-elements defer='defer";
+                        } else {
+                            $url .= "' defer='defer";
+                        }
+                    }
+                } else {
+                    $url = ''; // removing the url removes the file
+                }
+
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add'.'_'.'options'.'_'.'page'; // won't pass theme check if function name present in theme
+            call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+
+            $db_settings = get_option( 'wp-font-awesome-settings' );
+
+            $defaults = array(
+                'type'      => 'CSS', // type to use, CSS or JS
+                'version'   => '', // latest
+                'enqueue'   => '', // front and backend
+                'shims'     => '1', // default on for now, @todo maybe change to off in 2020
+                'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
+                'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
+            );
+
+            $settings = wp_parse_args( $db_settings, $defaults );
+
+            /**
+             * Filter the Font Awesome settings.
+             *
+             * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+        }
+
+
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
+            }
+
+            // a hidden way to force the update of the verison number vai api instead of waiting the 48 hours
+            if(isset($_REQUEST['force-version-check'])){
+                $this->get_latest_version($force_api = true);
+            }
+            ?>
 			<div class="wrap">
 				<h1><?php echo $this->name; ?></h1>
 				<form method="post" action="options.php">
 					<?php
-					settings_fields( 'wp-font-awesome-settings' );
-					do_settings_sections( 'wp-font-awesome-settings' );
-					?>
+                    settings_fields( 'wp-font-awesome-settings' );
+                    do_settings_sections( 'wp-font-awesome-settings' );
+                    ?>
 					<table class="form-table">
 						<tr valign="top">
 							<th scope="row"><label for="wpfas-type"><?php _e( 'Type', 'font-awesome-settings' ); ?></label></th>
@@ -396,87 +396,87 @@ 
 
 					</table>
 					<?php
-					submit_button();
-					?>
+                    submit_button();
+                    ?>
 				</form>
 
 				<div id="wpfas-version"><?php echo $this->version; ?></div>
 			</div>
 
 			<?php
-		}
-
-		/**
-		 * Check a version number is valid and if so return it or else return an empty string.
-		 *
-		 * @param $version string The version number to check.
-		 * @since 1.0.6
-		 *
-		 * @return string Either a valid version number or an empty string.
-		 */
-		public function validate_version_number( $version ) {
-
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
-				// valid
-			} else {
-				$version = '';// not validated
-			}
-
-			return $version;
-		}
-
-
-		/**
-		 * Get the latest version of Font Awesome.
-		 *
-		 * We check for a cached bersion and if none we will check for a live version via API and then cache it for 48 hours.
-		 *
-		 * @since 1.0.7
-		 * @return mixed|string The latest version number found.
-		 */
-		public function get_latest_version($force_api = false) {
-			$latest_version = $this->latest;
-
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
-
-			if ( $cache === false || $force_api) { // its not set
-				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
-				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $cache;
-				}
-			}
-
-			return $latest_version;
-		}
-
-		/**
-		 * Get the latest Font Awesome version from the github API.
-		 *
-		 * @since 1.0.7
-		 * @return string The latest version number or `0` on API fail.
-		 */
-		public function get_latest_version_from_api() {
-			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
-					$version = $api_response['tag_name'];
-				}
-			}
-
-			return $version;
-		}
-
-	}
-
-	/**
-	 * Run the class if found.
-	 */
-	WP_Font_Awesome_Settings::instance();
+        }
+
+        /**
+         * Check a version number is valid and if so return it or else return an empty string.
+         *
+         * @param $version string The version number to check.
+         * @since 1.0.6
+         *
+         * @return string Either a valid version number or an empty string.
+         */
+        public function validate_version_number( $version ) {
+
+            if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+                // valid
+            } else {
+                $version = '';// not validated
+            }
+
+            return $version;
+        }
+
+
+        /**
+         * Get the latest version of Font Awesome.
+         *
+         * We check for a cached bersion and if none we will check for a live version via API and then cache it for 48 hours.
+         *
+         * @since 1.0.7
+         * @return mixed|string The latest version number found.
+         */
+        public function get_latest_version($force_api = false) {
+            $latest_version = $this->latest;
+
+            $cache = get_transient( 'wp-font-awesome-settings-version' );
+
+            if ( $cache === false || $force_api) { // its not set
+                $api_ver = $this->get_latest_version_from_api();
+                if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $api_ver;
+                    set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+                }
+            } elseif ( $this->validate_version_number( $cache ) ) {
+                if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $cache;
+                }
+            }
+
+            return $latest_version;
+        }
+
+        /**
+         * Get the latest Font Awesome version from the github API.
+         *
+         * @since 1.0.7
+         * @return string The latest version number or `0` on API fail.
+         */
+        public function get_latest_version_from_api() {
+            $version  = "0";
+            $response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
+            if ( ! is_wp_error( $response ) && is_array( $response ) ) {
+                $api_response = json_decode( wp_remote_retrieve_body( $response ), true );
+                if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+                    $version = $api_response['tag_name'];
+                }
+            }
+
+            return $version;
+        }
+
+    }
+
+    /**
+     * Run the class if found.
+     */
+    WP_Font_Awesome_Settings::instance();
 }
\ No newline at end of file

includes/wpinv-item-functions.php

Indentation +1 added lines, -1 removed lines

@@ -799,7 +799,7 @@
                 case 'trial_interval':
                     $value = absint( $value );
                 break;
-				case 'editable':
+                case 'editable':
                     $value = (int) $value;
                 break;
             }

vendor/ayecode/wp-super-duper/wp-super-duper.php

Indentation +1360 added lines, -1360 removed lines

@@ -1,141 +1,141 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
 
-	/**
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
-	 *
-	 * Should not be called direct but extended instead.
-	 *
-	 * Class WP_Super_Duper
-	 * @since 1.0.3 is_block_content_call() method added.
-	 * @since 1.0.3 Placeholder text will be shown for widget that return no block content.
-	 * @since 1.0.4 is_elementor_widget_output() method added.
-	 * @since 1.0.4 is_elementor_preview() method added.
-	 * @since 1.0.5 Block checkbox options are set as true by default even when set as false - FIXED
-	 * @since 1.0.6 Some refactoring for page builders - CHANGED
-	 * @since 1.0.7 Some refactoring for page builders - CHANGED
-	 * @since 1.0.8 Some refactoring for page builders ( cornerstone builder now supported ) - CHANGED
-	 * @since 1.0.9 Numbers saving as strings and not numbers which can cause block render issues on refresh - FIXED
-	 * @since 1.0.10 Some refactoring for page builders ( Avia builder for Enfold theme now supported ) - CHANGED
-	 * @ver 1.0.10
-	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = "1.0.10";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
-		 * Take the array options and use them to build.
-		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name']
-			);
-			$this->base_id                     = $options['base_id'];
-			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-
-			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
-
-			if ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
-
-				// register shortcode
-				$this->register_shortcode();
-
-				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-			}
-
-			// add the CSS and JS we need ONCE
-			global $sd_widget_scripts;
-
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
-
-				$sd_widget_scripts = true;
-
-				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
-					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				add_action( 'cornerstone_load_builder', array(
-					$this,
-					'shortcode_insert_button_script'
-				) ); // for cornerstone builder (this is the preview)
-
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
-
-				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
-			}
-
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
-
-		/**
-		 * A function to ge the shortcode builder picker html.
-		 *
-		 * @param string $editor_id
-		 *
-		 * @return string
-		 */
-		public static function get_picker( $editor_id = '' ) {
-
-			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
-
-			global $sd_widgets;
-			?>
+    /**
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
+     *
+     * Should not be called direct but extended instead.
+     *
+     * Class WP_Super_Duper
+     * @since 1.0.3 is_block_content_call() method added.
+     * @since 1.0.3 Placeholder text will be shown for widget that return no block content.
+     * @since 1.0.4 is_elementor_widget_output() method added.
+     * @since 1.0.4 is_elementor_preview() method added.
+     * @since 1.0.5 Block checkbox options are set as true by default even when set as false - FIXED
+     * @since 1.0.6 Some refactoring for page builders - CHANGED
+     * @since 1.0.7 Some refactoring for page builders - CHANGED
+     * @since 1.0.8 Some refactoring for page builders ( cornerstone builder now supported ) - CHANGED
+     * @since 1.0.9 Numbers saving as strings and not numbers which can cause block render issues on refresh - FIXED
+     * @since 1.0.10 Some refactoring for page builders ( Avia builder for Enfold theme now supported ) - CHANGED
+     * @ver 1.0.10
+     */
+    class WP_Super_Duper extends WP_Widget {
+
+        public $version = "1.0.10";
+        public $block_code;
+        public $options;
+        public $base_id;
+        public $arguments = array();
+        public $instance = array();
+        private $class_name;
+
+        /**
+         * Take the array options and use them to build.
+         */
+        public function __construct( $options ) {
+            global $sd_widgets;
+
+            $sd_widgets[ $options['base_id'] ] = array(
+                'name'       => $options['name'],
+                'class_name' => $options['class_name']
+            );
+            $this->base_id                     = $options['base_id'];
+            // lets filter the options before we do anything
+            $options       = apply_filters( "wp_super_duper_options", $options );
+            $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
+            $options       = $this->add_name_from_key( $options );
+            $this->options = $options;
+
+            $this->base_id   = $options['base_id'];
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+
+            // init parent
+            parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+
+            if ( isset( $options['class_name'] ) ) {
+                // register widget
+                $this->class_name = $options['class_name'];
+
+                // register shortcode
+                $this->register_shortcode();
+
+                // register block
+                add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+            }
+
+            // add the CSS and JS we need ONCE
+            global $sd_widget_scripts;
+
+            if ( ! $sd_widget_scripts ) {
+                wp_add_inline_script( 'admin-widgets', $this->widget_js() );
+                wp_add_inline_script( 'customize-controls', $this->widget_js() );
+                wp_add_inline_style( 'widgets', $this->widget_css() );
+
+                $sd_widget_scripts = true;
+
+                // add shortcode insert button once
+                add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+                if ( $this->is_preview() ) {
+                    add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+                    // this makes the insert button work for elementor
+                    add_action( 'elementor/editor/after_enqueue_scripts', array(
+                        $this,
+                        'shortcode_insert_button_script'
+                    ) ); // for elementor
+                }
+                // this makes the insert button work for cornerstone
+                add_action( 'cornerstone_load_builder', array(
+                    $this,
+                    'shortcode_insert_button_script'
+                ) ); // for cornerstone builder (this is the preview)
+
+                add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+                add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+
+                // add generator text to admin head
+                add_action( 'admin_head', array( $this, 'generator' ) );
+            }
+
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
+
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
+
+            ob_start();
+            if ( isset( $_POST['editor_id'] ) ) {
+                $editor_id = esc_attr( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
+
+            global $sd_widgets;
+            ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				asort( $sd_widgets );
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
-
-				}
-				?>
+                asort( $sd_widgets );
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
+
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -146,8 +146,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
 					<?php } ?>
 					<button class="button"
 					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -155,129 +155,129 @@ 
 			</div>
 			<?php
 
-			$html = ob_get_clean();
-
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
-
-				// some builder get the editor via ajax so we should not die on those ocasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
-
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
-
-				if ( $should_die ) {
-					wp_die();
-				}
-
-			} else {
-				return $html;
-			}
-
-			return '';
-
-		}
-
-		/**
-		 * Output the version in the admin header.
-		 */
-		public function generator() {
-			echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
-		}
-
-		/**
-		 * Get widget settings.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
-				wp_die();
-			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
-
-			// invoke an instance method
-			$widget = new $class_name;
-
-			ob_start();
-			$widget->form( array() );
-			$form = ob_get_clean();
-			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
-			echo "<style>" . $widget->widget_css() . "</style>";
-			echo "<script>" . $widget->widget_js() . "</script>";
-			?>
+            $html = ob_get_clean();
+
+            if ( wp_doing_ajax() ) {
+                echo $html;
+                $should_die = true;
+
+                // some builder get the editor via ajax so we should not die on those ocasions
+                $dont_die = array(
+                    'parent_tag',// WP Bakery
+                    'avia_request' // enfold
+                );
+
+                foreach ( $dont_die as $request ) {
+                    if ( isset( $_REQUEST[ $request ] ) ) {
+                        $should_die = false;
+                    }
+                }
+
+                if ( $should_die ) {
+                    wp_die();
+                }
+
+            } else {
+                return $html;
+            }
+
+            return '';
+
+        }
+
+        /**
+         * Output the version in the admin header.
+         */
+        public function generator() {
+            echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
+        }
+
+        /**
+         * Get widget settings.
+         *
+         * @since 1.0.0
+         */
+        public static function get_widget_settings() {
+            global $sd_widgets;
+
+            $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
+            if ( ! $shortcode ) {
+                wp_die();
+            }
+            $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
+            if ( ! $widget_args ) {
+                wp_die();
+            }
+            $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+            if ( ! $class_name ) {
+                wp_die();
+            }
+
+            // invoke an instance method
+            $widget = new $class_name;
+
+            ob_start();
+            $widget->form( array() );
+            $form = ob_get_clean();
+            echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
+            echo "<style>" . $widget->widget_css() . "</style>";
+            echo "<script>" . $widget->widget_js() . "</script>";
+            ?>
 			<?php
-			wp_die();
-		}
-
-		/**
-		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
-		 * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
-		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
-
-
-			/**
-			 * Cornerstone makes us play dirty tricks :/
-			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
-			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '<span id="insert-media-button">';
-			}
-
-			echo self::shortcode_button( 'this', 'true' );
-
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
-
-			self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			$shortcode_insert_button_once = true;
-		}
-
-		/**
-		 * Gets the shortcode insert button html.
-		 *
-		 * @param string $id
-		 * @param string $search_for_id
-		 *
-		 * @return mixed
-		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+            wp_die();
+        }
+
+        /**
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+         *
+         * @since 1.0.0
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
+         */
+        public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+            global $sd_widgets, $shortcode_insert_button_once;
+            if ( $shortcode_insert_button_once ) {
+                return;
+            }
+            add_thickbox();
+
+
+            /**
+             * Cornerstone makes us play dirty tricks :/
+             * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
+             */
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '<span id="insert-media-button">';
+            }
+
+            echo self::shortcode_button( 'this', 'true' );
+
+            // see opening note
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '</span>'; // end #insert-media-button
+            }
+
+            self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+            $shortcode_insert_button_once = true;
+        }
+
+        /**
+         * Gets the shortcode insert button html.
+         *
+         * @param string $id
+         * @param string $search_for_id
+         *
+         * @return mixed
+         */
+        public static function shortcode_button( $id = '', $search_for_id = '' ) {
+            ob_start();
+            ?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
-					echo "," . $search_for_id;
-				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
+                if ( $search_for_id ) {
+                    echo "," . $search_for_id;
+                } ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
 					<span style="vertical-align: middle;line-height: 18px;font-size: 20px;"
 					      class="dashicons dashicons-screenoptions"></span>
@@ -288,21 +288,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
-
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
-
-		/**
-		 * Makes SD work with the siteOrigin page builder.
-		 *
-		 * @since 1.0.6
-		 * @return mixed
-		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+            $html = ob_get_clean();
+
+            // remove line breaks so we can use it in js
+            return preg_replace( "/\r|\n/", "", trim( $html ) );
+        }
+
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @since 1.0.6
+         * @return mixed
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items shoudl be shown or hidden.
@@ -380,28 +380,28 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-		/**
-		 * Output the JS and CSS for the shortcode insert button.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @param string $editor_id
-		 * @param string $insert_shortcode_function
-		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+        /**
+         * Output the JS and CSS for the shortcode insert button.
+         *
+         * @since 1.0.6
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -520,22 +520,22 @@ 
 				}
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                echo "<script>" . self::siteorigin_js() . "</script>";
+            }
+            ?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
-
-				/**
-				 * Function for super duper insert shortcode.
-				 *
-				 * @since 1.0.0
-				 */
-				?>
+                if(! empty( $insert_shortcode_function )){
+                    echo $insert_shortcode_function;
+                }else{
+
+                /**
+                 * Function for super duper insert shortcode.
+                 *
+                 * @since 1.0.0
+                 */
+                ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
@@ -543,14 +543,14 @@ 
 						if (!$editor_id) {
 
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-							} else {
-								echo '$editor_id = "#wp-content-editor-container textarea";';
-							}
-							?>
+                            if ( isset( $_REQUEST['et_fb'] ) ) {
+                                echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+                            } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+                                echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+                            } else {
+                                echo '$editor_id = "#wp-content-editor-container textarea";';
+                            }
+                            ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -852,16 +852,16 @@ 
 			</script>
 
 			<?php
-		}
-
-		/**
-		 * Gets some CSS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_css() {
-			ob_start();
-			?>
+        }
+
+        /**
+         * Gets some CSS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_css() {
+            ob_start();
+            ?>
 			<style>
 				.sd-advanced-setting {
 					display: none;
@@ -882,26 +882,26 @@ 
 				}
 			</style>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
-
-		/**
-		 * Gets some JS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', $output );
+        }
+
+        /**
+         * Gets some JS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_js() {
+            ob_start();
+            ?>
 			<script>
 
 				/**
@@ -1056,302 +1056,302 @@ 
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-
-		/**
-		 * Set the name from the argument key.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
-				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Register the parent shortcode.
-		 *
-		 * @since 1.0.0
-		 */
-		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
-		}
-
-		/**
-		 * Render the shortcode via ajax so we can return it to Gutenberg.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function render_shortcode() {
-
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die();
-			}
-
-			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
-					global $post;
-					$post = $post_obj;
-				}
-			}
-
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
-					}
-				}
-
-				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
-
-				echo do_shortcode( $shortcode );
-
-			}
-			wp_die();
-		}
-
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$args = self::argument_values( $args );
-
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
-
-
-			$calss = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-
-			$calss = apply_filters( 'wp_super_duper_div_classname', $calss, $args, $this );
-			$calss = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $calss, $args, $this );
-
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-			$shortcode_args = array();
-			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			$main_content   = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
-				// wrap the shortcode in a dive with the same class as the widget
-				$output .= '<div class="' . $calss . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
-					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
-						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
-									$shortcode_args['before_title'] = $sidebar['before_title'];
-									$shortcode_args['after_title']  = $sidebar['after_title'];
-									break;
-								}
-							}
-						}
-					}
-					$output .= $this->output_title( $shortcode_args, $args );
-				}
-				$output .= $main_content;
-				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
-				$output .= $main_content;
-			}
-
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
-		 *
-		 * @param string $name
-		 *
-		 * @return string
-		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
-		}
-
-		/**
-		 * Sometimes booleans values can be turned to strings, so we fix that.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @return array
-		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
-
-			return $argument_values;
-		}
-
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Set arguments.
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
-
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Get arguments.
-		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
-
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
-
-			return $this->arguments;
-		}
-
-		/**
-		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
-		 *
-		 * @param array $args
-		 * @param array $widget_args
-		 * @param string $content
-		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		}
-
-		/**
-		 * Add the dynamic block code inline when the wp-block in enqueued.
-		 */
-		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
-
-			}
-		}
-
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$show      = false;
-			$arguments = $this->arguments;
-
-			if ( empty( $arguments ) ) {
-				$arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-					}
-				}
-			}
-
-			return $show;
-		}
-
-
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
-		 * @since 1.0.9 Save numbers as numbers and not strings.
-		 * @return mixed
-		 */
-		public function block() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+
+        /**
+         * Set the name from the argument key.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        private function add_name_from_key( $options, $arguments = false ) {
+            if ( ! empty( $options['arguments'] ) ) {
+                foreach ( $options['arguments'] as $key => $val ) {
+                    $options['arguments'][ $key ]['name'] = $key;
+                }
+            } elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
+                foreach ( $options as $key => $val ) {
+                    $options[ $key ]['name'] = $key;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Register the parent shortcode.
+         *
+         * @since 1.0.0
+         */
+        public function register_shortcode() {
+            add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
+            add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
+        }
+
+        /**
+         * Render the shortcode via ajax so we can return it to Gutenberg.
+         *
+         * @since 1.0.0
+         */
+        public static function render_shortcode() {
+
+            check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die();
+            }
+
+            // we might need the $post value here so lets set it.
+            if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
+                $post_obj = get_post( absint( $_POST['post_id'] ) );
+                if ( ! empty( $post_obj ) && empty( $post ) ) {
+                    global $post;
+                    $post = $post_obj;
+                }
+            }
+
+            if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+                $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+                $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+                $attributes       = '';
+                if ( ! empty( $attributes_array ) ) {
+                    foreach ( $attributes_array as $key => $value ) {
+                        $attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
+                    }
+                }
+
+                $shortcode = "[" . $shortcode_name . " " . $attributes . "]";
+
+                echo do_shortcode( $shortcode );
+
+            }
+            wp_die();
+        }
+
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $args = self::argument_values( $args );
+
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
+
+
+            $calss = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+
+            $calss = apply_filters( 'wp_super_duper_div_classname', $calss, $args, $this );
+            $calss = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $calss, $args, $this );
+
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+            $shortcode_args = array();
+            $output         = '';
+            $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+            $main_content   = $this->output( $args, $shortcode_args, $content );
+            if ( $main_content && ! $no_wrap ) {
+                // wrap the shortcode in a dive with the same class as the widget
+                $output .= '<div class="' . $calss . '" ' . $attrs . '>';
+                if ( ! empty( $args['title'] ) ) {
+                    // if its a shortcode and there is a title try to grab the title wrappers
+                    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
+                    if ( empty( $instance ) ) {
+                        global $wp_registered_sidebars;
+                        if ( ! empty( $wp_registered_sidebars ) ) {
+                            foreach ( $wp_registered_sidebars as $sidebar ) {
+                                if ( ! empty( $sidebar['before_title'] ) ) {
+                                    $shortcode_args['before_title'] = $sidebar['before_title'];
+                                    $shortcode_args['after_title']  = $sidebar['after_title'];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    $output .= $this->output_title( $shortcode_args, $args );
+                }
+                $output .= $main_content;
+                $output .= '</div>';
+            } elseif ( $main_content && $no_wrap ) {
+                $output .= $main_content;
+            }
+
+            // if preview show a placeholder if empty
+            if ( $this->is_preview() && $output == '' ) {
+                $output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
+            }
+
+            return $output;
+        }
+
+        /**
+         * Placeholder text to show if output is empty and we are on a preview/builder page.
+         *
+         * @param string $name
+         *
+         * @return string
+         */
+        public function preview_placeholder_text( $name = '' ) {
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+        }
+
+        /**
+         * Sometimes booleans values can be turned to strings, so we fix that.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        public function string_to_bool( $options ) {
+            // convert bool strings to booleans
+            foreach ( $options as $key => $val ) {
+                if ( $val == 'false' ) {
+                    $options[ $key ] = false;
+                } elseif ( $val == 'true' ) {
+                    $options[ $key ] = true;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @return array
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
+
+            return $argument_values;
+        }
+
+        /**
+         * Set arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Set arguments.
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
+
+        /**
+         * Get arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Get arguments.
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
+
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
+
+            return $this->arguments;
+        }
+
+        /**
+         * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
+         *
+         * @param array $args
+         * @param array $widget_args
+         * @param string $content
+         */
+        public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        }
+
+        /**
+         * Add the dynamic block code inline when the wp-block in enqueued.
+         */
+        public function register_block() {
+            wp_add_inline_script( 'wp-blocks', $this->block() );
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+
+                wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+
+            }
+        }
+
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
+
+            $show      = false;
+            $arguments = $this->arguments;
+
+            if ( empty( $arguments ) ) {
+                $arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $argument ) {
+                    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+                        $show = true;
+                    }
+                }
+            }
+
+            return $show;
+        }
+
+
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+         * @since 1.0.9 Save numbers as numbers and not strings.
+         * @return mixed
+         */
+        public function block() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * BLOCK: Basic
@@ -1390,76 +1390,76 @@ 
 						icon: '<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
-					}?>
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
+                    }?>
 
 						<?php
 
-						$show_advanced = $this->block_show_advanced();
-
-						$show_alignment = false;
-
-						if ( ! empty( $this->arguments ) ) {
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "	type: 'boolean',";
-								echo "  default: false,";
-								echo "},";
-							}
-
-							// block wrap element
-							if ( isset( $this->options['block-wrap'] ) ) { //@todo we should validate this?
-								echo "block_wrap: {";
-								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
-								echo "},";
-							}
-
-
-							foreach ( $this->arguments as $key => $args ) {
-
-								// set if we should show alignment
-								if ( $key == 'alignment' ) {
-									$show_alignment = true;
-								}
-
-								$extra = '';
-
-								if ( $args['type'] == 'checkbox' ) {
-									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
-									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-									$type = 'array';
-									if ( is_array( $args['default'] ) ) {
-										$default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
-									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									}
-								} elseif ( $args['type'] == 'multiselect' ) {
-									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} else {
-									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								}
-								echo $key . " : {";
-								echo "type : '$type',";
-								echo "default : $default,";
-								echo "},";
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-
-							echo "},";
-
-						}
-
-						?>
+                        $show_advanced = $this->block_show_advanced();
+
+                        $show_alignment = false;
+
+                        if ( ! empty( $this->arguments ) ) {
+                            echo "attributes : {";
+
+                            if ( $show_advanced ) {
+                                echo "show_advanced: {";
+                                echo "	type: 'boolean',";
+                                echo "  default: false,";
+                                echo "},";
+                            }
+
+                            // block wrap element
+                            if ( isset( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+                                echo "block_wrap: {";
+                                echo "	type: 'string',";
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+                                echo "},";
+                            }
+
+
+                            foreach ( $this->arguments as $key => $args ) {
+
+                                // set if we should show alignment
+                                if ( $key == 'alignment' ) {
+                                    $show_alignment = true;
+                                }
+
+                                $extra = '';
+
+                                if ( $args['type'] == 'checkbox' ) {
+                                    $type    = 'boolean';
+                                    $default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
+                                } elseif ( $args['type'] == 'number' ) {
+                                    $type    = 'number';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                    $type = 'array';
+                                    if ( is_array( $args['default'] ) ) {
+                                        $default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+                                    } else {
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    }
+                                } elseif ( $args['type'] == 'multiselect' ) {
+                                    $type    = 'array';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } else {
+                                    $type    = 'string';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                }
+                                echo $key . " : {";
+                                echo "type : '$type',";
+                                echo "default : $default,";
+                                echo "},";
+                            }
+
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+
+                            echo "},";
+
+                        }
+
+                        ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
@@ -1478,8 +1478,8 @@ 
 										'shortcode': '<?php echo $this->options['base_id'];?>',
 										'attributes': props.attributes,
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}?>,
+                                        echo $post->ID;
+                                    }?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -1526,10 +1526,10 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+                                    if(! empty( $this->arguments )){
 
-									if ( $show_advanced ) {
-									?>
+                                    if ( $show_advanced ) {
+                                    ?>
 									el(
 										wp.components.ToggleControl,
 										{
@@ -1542,73 +1542,73 @@ 
 									),
 									<?php
 
-									}
-
-									foreach($this->arguments as $key => $args){
-									$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-									$options = '';
-									$extra = '';
-									$require = '';
-									$onchange = "props.setAttributes({ $key: $key } )";
-									$value = "props.attributes.$key";
-									$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
-									if ( in_array( $args['type'], $text_type ) ) {
-										$type = 'TextControl';
-										// Save numbers as numbers and not strings
-										if ( $args['type'] == 'number' ) {
-											$onchange = "props.setAttributes({ $key: Number($key) } )";
-										}
-									}
+                                    }
+
+                                    foreach($this->arguments as $key => $args){
+                                    $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+                                    $options = '';
+                                    $extra = '';
+                                    $require = '';
+                                    $onchange = "props.setAttributes({ $key: $key } )";
+                                    $value = "props.attributes.$key";
+                                    $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
+                                    if ( in_array( $args['type'], $text_type ) ) {
+                                        $type = 'TextControl';
+                                        // Save numbers as numbers and not strings
+                                        if ( $args['type'] == 'number' ) {
+                                            $onchange = "props.setAttributes({ $key: Number($key) } )";
+                                        }
+                                    }
 //									elseif ( $args['type'] == 'color' ) { //@todo ColorPicker labels are not shown yet, we may have to add our own https://github.com/WordPress/gutenberg/issues/14378
 //										$type = 'ColorPicker';
 //									}
-									elseif ( $args['type'] == 'checkbox' ) {
-										$type = 'CheckboxControl';
-										$extra .= "checked: props.attributes.$key,";
-										$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-									} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-										$type = 'SelectControl';
-										if ( ! empty( $args['options'] ) ) {
-											$options .= "options  : [";
-											foreach ( $args['options'] as $option_val => $option_label ) {
-												$options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
-											}
-											$options .= "],";
-										}
-										if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-											$extra .= ' multiple: true, ';
-											//$onchange = "props.setAttributes({ $key: ['edit'] } )";
-											//$value = "['edit', 'delete']";
-										}
-									} elseif ( $args['type'] == 'alignment' ) {
-										$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-									} else {
-										continue;// if we have not implemented the control then don't break the JS.
-									}
-
-									// add show only if advanced
-									if ( ! empty( $args['advanced'] ) ) {
-										echo "props.attributes.show_advanced && ";
-									}
-									// add setting require if defined
-									if ( ! empty( $args['element_require'] ) ) {
-										echo $this->block_props_replace( $args['element_require'], true ) . " && ";
-									}
-									?>
+                                    elseif ( $args['type'] == 'checkbox' ) {
+                                        $type = 'CheckboxControl';
+                                        $extra .= "checked: props.attributes.$key,";
+                                        $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+                                    } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+                                        $type = 'SelectControl';
+                                        if ( ! empty( $args['options'] ) ) {
+                                            $options .= "options  : [";
+                                            foreach ( $args['options'] as $option_val => $option_label ) {
+                                                $options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
+                                            }
+                                            $options .= "],";
+                                        }
+                                        if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+                                            $extra .= ' multiple: true, ';
+                                            //$onchange = "props.setAttributes({ $key: ['edit'] } )";
+                                            //$value = "['edit', 'delete']";
+                                        }
+                                    } elseif ( $args['type'] == 'alignment' ) {
+                                        $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+                                    } else {
+                                        continue;// if we have not implemented the control then don't break the JS.
+                                    }
+
+                                    // add show only if advanced
+                                    if ( ! empty( $args['advanced'] ) ) {
+                                        echo "props.attributes.show_advanced && ";
+                                    }
+                                    // add setting require if defined
+                                    if ( ! empty( $args['element_require'] ) ) {
+                                        echo $this->block_props_replace( $args['element_require'], true ) . " && ";
+                                    }
+                                    ?>
 									el(
 										wp.components.<?php echo esc_attr( $type );?>,
 										{
 											label: '<?php echo esc_attr( $args['title'] );?>',
 											help: '<?php if ( isset( $args['desc'] ) ) {
-												echo esc_attr( $args['desc'] );
-											}?>',
+                                                echo esc_attr( $args['desc'] );
+                                            }?>',
 											value: <?php echo $value;?>,
 											<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-											echo "type: '" . esc_attr( $args['type'] ) . "',";
-										}?>
+                                            echo "type: '" . esc_attr( $args['type'] ) . "',";
+                                        }?>
 											<?php if ( ! empty( $args['placeholder'] ) ) {
-											echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
-										}?>
+                                            echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
+                                        }?>
 											<?php echo $options;?>
 											<?php echo $extra;?>
 											<?php echo $custom_attributes;?>
@@ -1618,27 +1618,27 @@ 
 										}
 									),
 									<?php
-									}
-									}
-									?>
+                                    }
+                                    }
+                                    ?>
 
 								),
 
 								<?php
-								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								?>
+                                // If the user sets block-output array then build it
+                                if ( ! empty( $this->options['block-output'] ) ) {
+                                $this->block_element( $this->options['block-output'] );
+                            }else{
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
+                                ?>
 								el('div', {
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
 									style: {'min-height': '30px'}
 								})
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 						},
 
@@ -1655,17 +1655,17 @@ 
 							var content = "[<?php echo $this->options['base_id'];?>";
 							<?php
 
-							if(! empty( $this->arguments )){
-							foreach($this->arguments as $key => $args){
-							?>
+                            if(! empty( $this->arguments )){
+                            foreach($this->arguments as $key => $args){
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 
 
@@ -1694,456 +1694,456 @@ 
 				})();
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
-
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= " $key='$val' ";
-					}
-				} else {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= "'$key': '$val',";
-					}
-				}
-			}
-
-			return $attributes;
-		}
-
-		/**
-		 * A self looping function to create the output for JS block elements.
-		 *
-		 * This is what is output in the WP Editor visual view.
-		 *
-		 * @param $args
-		 */
-		public function block_element( $args ) {
-
-
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
-
-					if ( is_array( $new_args ) ) { // its an element
-
-
-						if ( isset( $new_args['element'] ) ) {
-
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
-
-							echo "\n el( '" . $new_args['element'] . "', {";
-
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
-
-
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
-								}
-							}
-
-							echo "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( $new_value ) . "'";
-									}
-
-									if ( is_array( $new_value ) ) {
-
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ) );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							echo ")";// end content
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
-		 * Replace block attributes placeholders with the proper naming.
-		 *
-		 * @param $string
-		 *
-		 * @return mixed
-		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
-			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
-			}
-
-			return $string;
-		}
-
-		/**
-		 * Outputs the content of the widget
-		 *
-		 * @param array $args
-		 * @param array $instance
-		 */
-		public function widget( $args, $instance ) {
-
-			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
-
-			if ( $output ) {
-				// Before widget
-				$before_widget = $args['before_widget'];
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
-
-				// After widget
-				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
-
-				echo $before_widget;
-				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
-				}
-				echo $this->output_title( $args, $instance );
-				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
-				}
-				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-				echo $output;
-			}
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor container.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @since 1.0.8
-		 * @return bool
-		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @return string
-		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-				$output = $args['before_title'] . $title . $args['after_title'];
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
-
-			// set widget instance
-			$this->instance = $instance;
-
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
-
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
-			$arguments = $this->get_arguments();
-
-			if ( is_array( $arguments ) ) {
-				foreach ( $arguments as $key => $args ) {
-					$this->widget_inputs( $args, $instance );
-				}
-			}
-		}
-
-		/**
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
-		 *
-		 * @return string
-		 */
-		public function widget_advanced_toggle() {
-
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
-
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
-
-			return $output;
-		}
-
-		/**
-		 * Convert require element.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 */
-		public function convert_element_require( $input ) {
-
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select').val()"
-			), $input ) );
-
-			return $output;
-		}
-
-		/**
-		 * Builds the inputs for the widget options.
-		 *
-		 * @param $args
-		 * @param $instance
-		 */
-		public function widget_inputs( $args, $instance ) {
-
-			$class             = "";
-			$element_require   = "";
-			$custom_attributes = "";
-
-			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
-			} else {
-				$value = '';
-			}
-
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
-
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
-
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
-
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
-
-			// before wrapper
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         */
+        public function array_to_attributes( $custom_attributes, $html = false ) {
+            $attributes = '';
+            if ( ! empty( $custom_attributes ) ) {
+
+                if ( $html ) {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= " $key='$val' ";
+                    }
+                } else {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= "'$key': '$val',";
+                    }
+                }
+            }
+
+            return $attributes;
+        }
+
+        /**
+         * A self looping function to create the output for JS block elements.
+         *
+         * This is what is output in the WP Editor visual view.
+         *
+         * @param $args
+         */
+        public function block_element( $args ) {
+
+
+            if ( ! empty( $args ) ) {
+                foreach ( $args as $element => $new_args ) {
+
+                    if ( is_array( $new_args ) ) { // its an element
+
+
+                        if ( isset( $new_args['element'] ) ) {
+
+                            if ( isset( $new_args['element_require'] ) ) {
+                                echo str_replace( array(
+                                        "'+",
+                                        "+'"
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                                unset( $new_args['element_require'] );
+                            }
+
+                            echo "\n el( '" . $new_args['element'] . "', {";
+
+                            // get the attributes
+                            foreach ( $new_args as $new_key => $new_value ) {
+
+
+                                if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+                                    // do nothing
+                                } else {
+                                    echo $this->block_element( array( $new_key => $new_value ) );
+                                }
+                            }
+
+                            echo "},";// end attributes
+
+                            // get the content
+                            $first_item = 0;
+                            foreach ( $new_args as $new_key => $new_value ) {
+                                if ( $new_key === 'content' || is_array( $new_value ) ) {
+
+                                    if ( $new_key === 'content' ) {
+                                        echo "'" . $this->block_props_replace( $new_value ) . "'";
+                                    }
+
+                                    if ( is_array( $new_value ) ) {
+
+                                        if ( isset( $new_value['element_require'] ) ) {
+                                            echo str_replace( array(
+                                                    "'+",
+                                                    "+'"
+                                                ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+                                            unset( $new_value['element_require'] );
+                                        }
+
+                                        if ( isset( $new_value['element_repeat'] ) ) {
+                                            $x = 1;
+                                            while ( $x <= absint( $new_value['element_repeat'] ) ) {
+                                                $this->block_element( array( '' => $new_value ) );
+                                                $x ++;
+                                            }
+                                        } else {
+                                            $this->block_element( array( '' => $new_value ) );
+                                        }
+                                    }
+                                    $first_item ++;
+                                }
+                            }
+
+                            echo ")";// end content
+
+                            echo ", \n";
+
+                        }
+                    } else {
+
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                        } elseif ( $element == 'style' ) {
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } else {
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+                        }
+
+                    }
+                }
+            }
+        }
+
+        /**
+         * Replace block attributes placeholders with the proper naming.
+         *
+         * @param $string
+         *
+         * @return mixed
+         */
+        public function block_props_replace( $string, $no_wrap = false ) {
+
+            if ( $no_wrap ) {
+                $string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+            } else {
+                $string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+            }
+
+            return $string;
+        }
+
+        /**
+         * Outputs the content of the widget
+         *
+         * @param array $args
+         * @param array $instance
+         */
+        public function widget( $args, $instance ) {
+
+            // get the filtered values
+            $argument_values = $this->argument_values( $instance );
+            $argument_values = $this->string_to_bool( $argument_values );
+            $output          = $this->output( $argument_values, $args );
+
+            if ( $output ) {
+                // Before widget
+                $before_widget = $args['before_widget'];
+                $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+                $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+
+                // After widget
+                $after_widget = $args['after_widget'];
+                $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+                $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+
+                echo $before_widget;
+                // elementor strips the widget wrapping div so we check for and add it back if needed
+                if ( $this->is_elementor_widget_output() ) {
+                    echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
+                }
+                echo $this->output_title( $args, $instance );
+                echo $output;
+                if ( $this->is_elementor_widget_output() ) {
+                    echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
+                }
+                echo $after_widget;
+            } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+                echo $output;
+            }
+        }
+
+        /**
+         * Tests if the current output is inside a elementor container.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_widget_output() {
+            $result = false;
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @since 1.0.8
+         * @return bool
+         */
+        public function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_preview() {
+            $preview = false;
+            if ( $this->is_divi_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_cornerstone_preview() ) {
+                $preview = true;
+            }
+
+            return $preview;
+        }
+
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @return string
+         */
+        public function output_title( $args, $instance = array() ) {
+            $output = '';
+            if ( ! empty( $instance['title'] ) ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+                $output = $args['before_title'] . $title . $args['after_title'];
+            }
+
+            return $output;
+        }
+
+        /**
+         * Outputs the options form inputs for the widget.
+         *
+         * @param array $instance The widget options.
+         */
+        public function form( $instance ) {
+
+            // set widget instance
+            $this->instance = $instance;
+
+            // set it as a SD widget
+            echo $this->widget_advanced_toggle();
+
+            echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+            $arguments = $this->get_arguments();
+
+            if ( is_array( $arguments ) ) {
+                foreach ( $arguments as $key => $args ) {
+                    $this->widget_inputs( $args, $instance );
+                }
+            }
+        }
+
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
+
+            $output = '';
+            if ( $this->block_show_advanced() ) {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
+
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+
+            return $output;
+        }
+
+        /**
+         * Convert require element.
+         *
+         * @since 1.0.0
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         */
+        public function convert_element_require( $input ) {
+
+            $input = str_replace( "'", '"', $input );// we only want double quotes
+
+            $output = esc_attr( str_replace( array( "[%", "%]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select').val()"
+            ), $input ) );
+
+            return $output;
+        }
+
+        /**
+         * Builds the inputs for the widget options.
+         *
+         * @param $args
+         * @param $instance
+         */
+        public function widget_inputs( $args, $instance ) {
+
+            $class             = "";
+            $element_require   = "";
+            $custom_attributes = "";
+
+            // get value
+            if ( isset( $instance[ $args['name'] ] ) ) {
+                $value = $instance[ $args['name'] ];
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+            } else {
+                $value = '';
+            }
+
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
+
+            // get if advanced
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+                $class .= " sd-advanced-setting ";
+            }
+
+            // element_require
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+                $element_require = $args['element_require'];
+            }
+
+            // custom_attributes
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+            }
+
+            // before wrapper
+            ?>
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
 			   data-argument='<?php echo esc_attr( $args['name'] ); ?>'
 			   data-element_require='<?php if ( $element_require ) {
-				   echo $this->convert_element_require( $element_require );
-			   } ?>'
+                    echo $this->convert_element_require( $element_require );
+                } ?>'
 			>
 				<?php
 
-				switch ( $args['type'] ) {
-					//array('text','password','number','email','tel','url','color')
-					case "text":
-					case "password":
-					case "number":
-					case "email":
-					case "tel":
-					case "url":
-					case "color":
-						?>
+                switch ( $args['type'] ) {
+                    //array('text','password','number','email','tel','url','color')
+                    case "text":
+                    case "password":
+                    case "number":
+                    case "email":
+                    case "tel":
+                    case "url":
+                    case "color":
+                        ?>
 						<label
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 						<input <?php echo $placeholder; ?> class="widefat"
@@ -2154,47 +2154,47 @@ 
 							                               value="<?php echo esc_attr( $value ); ?>">
 						<?php
 
-						break;
-					case "select":
-						$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-						if ( $multiple ) {
-							if ( empty( $value ) ) {
-								$value = array();
-							}
-						}
-						?>
+                        break;
+                    case "select":
+                        $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                        if ( $multiple ) {
+                            if ( empty( $value ) ) {
+                                $value = array();
+                            }
+                        }
+                        ?>
 						<label
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 						<select <?php echo $placeholder; ?> class="widefat"
 							<?php echo $custom_attributes; ?>
 							                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 							                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-							                                if ( $multiple ) {
-								                                echo "[]";
-							                                } ?>"
+                                                            if ( $multiple ) {
+                                                                echo "[]";
+                                                            } ?>"
 							<?php if ( $multiple ) {
-								echo "multiple";
-							} //@todo not implemented yet due to gutenberg not supporting it
-							?>
+                                echo "multiple";
+                            } //@todo not implemented yet due to gutenberg not supporting it
+                            ?>
 						>
 							<?php
 
-							if ( ! empty( $args['options'] ) ) {
-								foreach ( $args['options'] as $val => $label ) {
-									if ( $multiple ) {
-										$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-									} else {
-										$selected = selected( $value, $val, false );
-									}
-									echo "<option value='$val' " . $selected . ">$label</option>";
-								}
-							}
-							?>
+                            if ( ! empty( $args['options'] ) ) {
+                                foreach ( $args['options'] as $val => $label ) {
+                                    if ( $multiple ) {
+                                        $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                    } else {
+                                        $selected = selected( $value, $val, false );
+                                    }
+                                    echo "<option value='$val' " . $selected . ">$label</option>";
+                                }
+                            }
+                            ?>
 						</select>
 						<?php
-						break;
-					case "checkbox":
-						?>
+                        break;
+                    case "checkbox":
+                        ?>
 						<input <?php echo $placeholder; ?>
 							<?php checked( 1, $value, true ) ?>
 							<?php echo $custom_attributes; ?>
@@ -2204,136 +2204,136 @@ 
 						<label
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 						<?php
-						break;
-					case "hidden":
-						?>
+                        break;
+                    case "hidden":
+                        ?>
 						<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 						       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
 						       value="<?php echo esc_attr( $value ); ?>">
 						<?php
-						break;
-					default:
-						echo "No input type found!"; // @todo we need to add more input types.
-				}
+                        break;
+                    default:
+                        echo "No input type found!"; // @todo we need to add more input types.
+                }
 
-				// after wrapper
-				?>
+                // after wrapper
+                ?>
 			</p>
 			<?php
 
-		}
-
-		/**
-		 * Get the widget input description html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 * @todo, need to make its own tooltip script
-		 */
-		public function widget_field_desc( $args ) {
-
-			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
-				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
-				}
-			}
-
-			return $description;
-		}
-
-		/**
-		 * Get the tool tip html.
-		 *
-		 * @param $tip
-		 * @param bool $allow_html
-		 *
-		 * @return string
-		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
-			} else {
-				$tip = esc_attr( $tip );
-			}
-
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
-
-		/**
-		 * Sanitize a string destined to be a tooltip.
-		 *
-		 * @param string $var
-		 *
-		 * @return string
-		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
-				'br'     => array(),
-				'em'     => array(),
-				'strong' => array(),
-				'small'  => array(),
-				'span'   => array(),
-				'ul'     => array(),
-				'li'     => array(),
-				'ol'     => array(),
-				'p'      => array(),
-			) ) );
-		}
-
-		/**
-		 * Processing widget options on save
-		 *
-		 * @param array $new_instance The new options
-		 * @param array $old_instance The previous options
-		 *
-		 * @return array
-		 * @todo we should add some sanitation here.
-		 */
-		public function update( $new_instance, $old_instance ) {
-
-			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->get_arguments();
-			}
-
-			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
-					}
-				}
-			}
-
-			return $instance;
-		}
-
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @since 1.0.3
-		 * @return bool
-		 */
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-	}
+        }
+
+        /**
+         * Get the widget input description html.
+         *
+         * @param $args
+         *
+         * @return string
+         * @todo, need to make its own tooltip script
+         */
+        public function widget_field_desc( $args ) {
+
+            $description = '';
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
+                    $description = $this->desc_tip( $args['desc'] );
+                } else {
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+                }
+            }
+
+            return $description;
+        }
+
+        /**
+         * Get the tool tip html.
+         *
+         * @param $tip
+         * @param bool $allow_html
+         *
+         * @return string
+         */
+        function desc_tip( $tip, $allow_html = false ) {
+            if ( $allow_html ) {
+                $tip = $this->sanitize_tooltip( $tip );
+            } else {
+                $tip = esc_attr( $tip );
+            }
+
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
+
+        /**
+         * Sanitize a string destined to be a tooltip.
+         *
+         * @param string $var
+         *
+         * @return string
+         */
+        public function sanitize_tooltip( $var ) {
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+                'br'     => array(),
+                'em'     => array(),
+                'strong' => array(),
+                'small'  => array(),
+                'span'   => array(),
+                'ul'     => array(),
+                'li'     => array(),
+                'ol'     => array(),
+                'p'      => array(),
+            ) ) );
+        }
+
+        /**
+         * Processing widget options on save
+         *
+         * @param array $new_instance The new options
+         * @param array $old_instance The previous options
+         *
+         * @return array
+         * @todo we should add some sanitation here.
+         */
+        public function update( $new_instance, $old_instance ) {
+
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
+
+            // check for checkboxes
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $argument ) {
+                    if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
+                        $instance[ $argument['name'] ] = '0';
+                    }
+                }
+            }
+
+            return $instance;
+        }
+
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @since 1.0.3
+         * @return bool
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+    }
 
 }
\ No newline at end of file