eventespresso / event-espresso-core

core/domain/services/assets/CoreAssetManager.php

Indentation +519 added lines, -519 removed lines

@@ -31,545 +31,545 @@
 class CoreAssetManager extends AssetManager
 {
 
-    // WordPress core / Third party JS asset handles
-    const JS_HANDLE_JQUERY = 'jquery';
+	// WordPress core / Third party JS asset handles
+	const JS_HANDLE_JQUERY = 'jquery';
 
-    const JS_HANDLE_JQUERY_VALIDATE = 'jquery-validate';
+	const JS_HANDLE_JQUERY_VALIDATE = 'jquery-validate';
 
-    const JS_HANDLE_JQUERY_VALIDATE_EXTRA = 'jquery-validate-extra-methods';
+	const JS_HANDLE_JQUERY_VALIDATE_EXTRA = 'jquery-validate-extra-methods';
 
-    const JS_HANDLE_UNDERSCORE = 'underscore';
+	const JS_HANDLE_UNDERSCORE = 'underscore';
 
-    const JS_HANDLE_ACCOUNTING_CORE = 'ee-accounting-core';
+	const JS_HANDLE_ACCOUNTING_CORE = 'ee-accounting-core';
 
-    /**
-     * @since $VID:$
-     */
-    const JS_HANDLE_REACT = 'react';
+	/**
+	 * @since $VID:$
+	 */
+	const JS_HANDLE_REACT = 'react';
 
-    /**
-     * @since $VID:$
-     */
-    const JS_HANDLE_REACT_DOM = 'react-dom';
+	/**
+	 * @since $VID:$
+	 */
+	const JS_HANDLE_REACT_DOM = 'react-dom';
 
-    /**
-     * @since $VID:$
-     */
-    const JS_HANDLE_LODASH = 'lodash';
+	/**
+	 * @since $VID:$
+	 */
+	const JS_HANDLE_LODASH = 'lodash';
 
-    // EE JS assets handles
-    const JS_HANDLE_EE_MANIFEST = 'ee-manifest';
+	// EE JS assets handles
+	const JS_HANDLE_EE_MANIFEST = 'ee-manifest';
 
-    const JS_HANDLE_EE_JS_CORE = 'eejs-core';
+	const JS_HANDLE_EE_JS_CORE = 'eejs-core';
 
-    const JS_HANDLE_EE_VENDOR = 'eventespresso-vendor';
+	const JS_HANDLE_EE_VENDOR = 'eventespresso-vendor';
 
-    const JS_HANDLE_EE_DATA_STORES = 'eventespresso-data-stores';
+	const JS_HANDLE_EE_DATA_STORES = 'eventespresso-data-stores';
 
-    const JS_HANDLE_EE_HELPERS = 'eventespresso-helpers';
+	const JS_HANDLE_EE_HELPERS = 'eventespresso-helpers';
 
-    const JS_HANDLE_EE_MODEL = 'eventespresso-model';
+	const JS_HANDLE_EE_MODEL = 'eventespresso-model';
 
-    const JS_HANDLE_EE_VALUE_OBJECTS = 'eventespresso-value-objects';
+	const JS_HANDLE_EE_VALUE_OBJECTS = 'eventespresso-value-objects';
 
-    const JS_HANDLE_EE_HOC_COMPONENTS = 'eventespresso-hoc-components';
+	const JS_HANDLE_EE_HOC_COMPONENTS = 'eventespresso-hoc-components';
 
-    const JS_HANDLE_EE_COMPONENTS = 'eventespresso-components';
+	const JS_HANDLE_EE_COMPONENTS = 'eventespresso-components';
 
-    const JS_HANDLE_EE_EDITOR_HOC_COMPONENTS = 'eventespresso-editor-hoc-components';
+	const JS_HANDLE_EE_EDITOR_HOC_COMPONENTS = 'eventespresso-editor-hoc-components';
 
-    const JS_HANDLE_EE_VALIDATORS = 'eventespresso-validators';
+	const JS_HANDLE_EE_VALIDATORS = 'eventespresso-validators';
 
-    const JS_HANDLE_EE_JS_API = 'eejs-api';
+	const JS_HANDLE_EE_JS_API = 'eejs-api';
 
-    const JS_HANDLE_EE_CORE = 'espresso_core';
+	const JS_HANDLE_EE_CORE = 'espresso_core';
 
-    const JS_HANDLE_EE_I18N = 'eei18n';
+	const JS_HANDLE_EE_I18N = 'eei18n';
 
-    const JS_HANDLE_EE_ACCOUNTING = 'ee-accounting';
-
-    const JS_HANDLE_EE_WP_PLUGINS_PAGE = 'ee-wp-plugins-page';
-
-    // EE CSS assets handles
-    const CSS_HANDLE_EE_DEFAULT = 'espresso_default';
-
-    const CSS_HANDLE_EE_CUSTOM = 'espresso_custom_css';
-
-    const CSS_HANDLE_EE_COMPONENTS = 'eventespresso-components';
-
-    /**
-     * @var EE_Currency_Config $currency_config
-     */
-    protected $currency_config;
-
-    /**
-     * @var EE_Template_Config $template_config
-     */
-    protected $template_config;
-
-
-    /**
-     * CoreAssetRegister constructor.
-     *
-     * @param AssetCollection    $assets
-     * @param EE_Currency_Config $currency_config
-     * @param EE_Template_Config $template_config
-     * @param DomainInterface    $domain
-     * @param Registry           $registry
-     */
-    public function __construct(
-        AssetCollection $assets,
-        EE_Currency_Config $currency_config,
-        EE_Template_Config $template_config,
-        DomainInterface $domain,
-        Registry $registry
-    ) {
-        $this->currency_config = $currency_config;
-        $this->template_config = $template_config;
-        parent::__construct($domain, $assets, $registry);
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     */
-    public function addAssets()
-    {
-        $this->addJavascriptFiles();
-        $this->addStylesheetFiles();
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     */
-    public function addJavascriptFiles()
-    {
-        $this->loadCoreJs();
-        $this->loadJqueryValidate();
-        $this->loadAccountingJs();
-        add_action(
-            'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__before_script',
-            array($this, 'loadQtipJs')
-        );
-        $this->registerAdminAssets();
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    public function addStylesheetFiles()
-    {
-        $this->loadCoreCss();
-    }
-
-
-    /**
-     * core default javascript
-     *
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     */
-    private function loadCoreJs()
-    {
-        // conditionally load third-party libraries that WP core MIGHT have.
-        $this->registerWpAssets();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_MANIFEST,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'manifest')
-        );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_JS_CORE,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'eejs'),
-            array(CoreAssetManager::JS_HANDLE_EE_MANIFEST)
-        )
-        ->setHasInlineData();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_VENDOR,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'vendor'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_JS_CORE,
-                CoreAssetManager::JS_HANDLE_REACT,
-                CoreAssetManager::JS_HANDLE_REACT_DOM,
-                CoreAssetManager::JS_HANDLE_LODASH,
-            )
-        );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_VALIDATORS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'validators')
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_HELPERS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'helpers'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_VALIDATORS
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_MODEL,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'model'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_HELPERS
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'valueObjects'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_MODEL
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'data-stores'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_VENDOR,
-                'wp-data',
-                'wp-api-request',
-                CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS
-            )
-        )
-             ->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_HOC_COMPONENTS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'hocComponents'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
-                CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS,
-                'wp-components',
-            )
-        )->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_COMPONENTS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'components'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
-                CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS,
-                'wp-components',
-            )
-        )
-        ->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_EDITOR_HOC_COMPONENTS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'editor-hocs'),
-            array(
-                CoreAssetManager::JS_HANDLE_EE_COMPONENTS
-            )
-        )->setRequiresTranslation();
-
-        $this->registry->addData('eejs_api_nonce', wp_create_nonce('wp_rest'));
-        $this->registry->addData(
-            'paths',
-            array(
-                'rest_route' => rest_url('ee/v4.8.36/'),
-                'collection_endpoints' => EED_Core_Rest_Api::getCollectionRoutesIndexedByModelName(),
-                'primary_keys' => EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName(),
-                'site_url' => site_url('/'),
-                'admin_url' => admin_url('/'),
-            )
-        );
-        /** site formatting values **/
-        $this->registry->addData(
-            'site_formats',
-            array(
-                'date_formats' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats()
-            )
-        );
-        /** currency data **/
-        $this->registry->addData(
-            'currency_config',
-            $this->getCurrencySettings()
-        );
-        /** site timezone */
-        $this->registry->addData(
-            'default_timezone',
-            array(
-                'pretty' => EEH_DTT_Helper::get_timezone_string_for_display(),
-                'string' => get_option('timezone_string'),
-                'offset' => EEH_DTT_Helper::get_site_timezone_gmt_offset(),
-            )
-        );
-        /** site locale (user locale if user logged in) */
-        $this->registry->addData(
-            'locale',
-            array(
-                'user' => get_user_locale(),
-                'site' => get_locale()
-            )
-        );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_CORE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
-            array(CoreAssetManager::JS_HANDLE_JQUERY)
-        )
-        ->setInlineDataCallback(
-            function () {
-                wp_localize_script(
-                    CoreAssetManager::JS_HANDLE_EE_CORE,
-                    CoreAssetManager::JS_HANDLE_EE_I18N,
-                    EE_Registry::$i18n_js_strings
-                );
-            }
-        );
-    }
-
-
-    /**
-     * Registers vendor files that are bundled with a later version WP but might not be for the current version of
-     * WordPress in the running environment.
-     *
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     * @since $VID:$
-     */
-    private function registerWpAssets()
-    {
-        global $wp_version;
-        if (version_compare($wp_version, '5.0.beta', '>=')) {
-            return;
-        }
-        $this->addVendorJavascript(CoreAssetManager::JS_HANDLE_REACT)
-            ->setVersion('16.6.0');
-        $this->addVendorJavascript(
-            CoreAssetManager::JS_HANDLE_REACT_DOM,
-            array(CoreAssetManager::JS_HANDLE_REACT)
-        )->setVersion('16.6.0');
-        $this->addVendorJavascript(CoreAssetManager::JS_HANDLE_LODASH)
-            ->setInlineDataCallback(
-                function() {
-                    wp_add_inline_script(
-                        CoreAssetManager::JS_HANDLE_LODASH,
-                        'window.lodash = _.noConflict();'
-                    );
-                }
-            )
-            ->setVersion('4.17.11');
-    }
-
-
-    /**
-     * Returns configuration data for the accounting-js library.
-     * @since $VID:$
-     * @return array
-     */
-    private function getAccountingSettings() {
-        return array(
-            'currency' => array(
-                'symbol'    => $this->currency_config->sign,
-                'format'    => array(
-                    'pos'  => $this->currency_config->sign_b4 ? '%s%v' : '%v%s',
-                    'neg'  => $this->currency_config->sign_b4 ? '- %s%v' : '- %v%s',
-                    'zero' => $this->currency_config->sign_b4 ? '%s--' : '--%s',
-                ),
-                'decimal'   => $this->currency_config->dec_mrk,
-                'thousand'  => $this->currency_config->thsnds,
-                'precision' => $this->currency_config->dec_plc,
-            ),
-            'number'   => array(
-                'precision' => $this->currency_config->dec_plc,
-                'thousand'  => $this->currency_config->thsnds,
-                'decimal'   => $this->currency_config->dec_mrk,
-            ),
-        );
-    }
-
-
-    /**
-     * Returns configuration data for the js Currency VO.
-     * @since $VID:$
-     * @return array
-     */
-    private function getCurrencySettings()
-    {
-        return array(
-            'code' => $this->currency_config->code,
-            'singularLabel' => $this->currency_config->name,
-            'pluralLabel' => $this->currency_config->plural,
-            'sign' => $this->currency_config->sign,
-            'signB4' => $this->currency_config->sign_b4,
-            'decimalPlaces' => $this->currency_config->dec_plc,
-            'decimalMark' => $this->currency_config->dec_mrk,
-            'thousandsSeparator' => $this->currency_config->thsnds,
-        );
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function loadCoreCss()
-    {
-        if ($this->template_config->enable_default_style && ! is_admin()) {
-            $this->addStylesheet(
-                CoreAssetManager::CSS_HANDLE_EE_DEFAULT,
-                is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')
-                    ? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css'
-                    : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-                array('dashicons')
-            );
-            //Load custom style sheet if available
-            if ($this->template_config->custom_style_sheet !== null) {
-                $this->addStylesheet(
-                    CoreAssetManager::CSS_HANDLE_EE_CUSTOM,
-                    EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
-                    array(CoreAssetManager::CSS_HANDLE_EE_DEFAULT)
-                );
-            }
-        }
-        $this->addStylesheet(
-            CoreAssetManager::CSS_HANDLE_EE_COMPONENTS,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                'components'
-            )
-        );
-    }
-
-
-    /**
-     * jQuery Validate for form validation
-     *
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function loadJqueryValidate()
-    {
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
-            array(CoreAssetManager::JS_HANDLE_JQUERY)
-        )
-        ->setVersion('1.15.0');
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE_EXTRA,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
-            array(CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE)
-        )
-        ->setVersion('1.15.0');
-    }
-
-
-    /**
-     * accounting.js for performing client-side calculations
-     *
-     * @since 4.9.62.p
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function loadAccountingJs()
-    {
-        //accounting.js library
-        // @link http://josscrowcroft.github.io/accounting.js/
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE,
-            EE_THIRD_PARTY_URL . 'accounting/accounting.js',
-            array(CoreAssetManager::JS_HANDLE_UNDERSCORE)
-        )
-        ->setVersion('0.3.2');
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
-            EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
-            array(CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE)
-        )
-        ->setInlineDataCallback(
-            function () {
-                 wp_localize_script(
-                     CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
-                     'EE_ACCOUNTING_CFG',
-                     $this->getAccountingSettings()
-                 );
-            }
-        )
-        ->setVersion();
-    }
-
-
-    /**
-     * registers assets for cleaning your ears
-     *
-     * @param JavascriptAsset $script
-     */
-    public function loadQtipJs(JavascriptAsset $script)
-    {
-        // qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
-        // can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-        if (
-            $script->handle() === CoreAssetManager::JS_HANDLE_EE_WP_PLUGINS_PAGE
-            && apply_filters('FHEE_load_qtip', false)
-        ) {
-            EEH_Qtip_Loader::instance()->register_and_enqueue();
-        }
-    }
-
-
-    /**
-     * assets that are used in the WordPress admin
-     *
-     * @since 4.9.62.p
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function registerAdminAssets()
-    {
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_WP_PLUGINS_PAGE,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'wp-plugins-page'),
-            array(
-                CoreAssetManager::JS_HANDLE_JQUERY,
-                CoreAssetManager::JS_HANDLE_EE_VENDOR,
-            )
-        )
-        ->setRequiresTranslation();
-
-        $this->addStylesheet(
-            CoreAssetManager::JS_HANDLE_EE_WP_PLUGINS_PAGE,
-            $this->registry->getCssUrl($this->domain->assetNamespace(), 'wp-plugins-page')
-        );
-    }
+	const JS_HANDLE_EE_ACCOUNTING = 'ee-accounting';
+
+	const JS_HANDLE_EE_WP_PLUGINS_PAGE = 'ee-wp-plugins-page';
+
+	// EE CSS assets handles
+	const CSS_HANDLE_EE_DEFAULT = 'espresso_default';
+
+	const CSS_HANDLE_EE_CUSTOM = 'espresso_custom_css';
+
+	const CSS_HANDLE_EE_COMPONENTS = 'eventespresso-components';
+
+	/**
+	 * @var EE_Currency_Config $currency_config
+	 */
+	protected $currency_config;
+
+	/**
+	 * @var EE_Template_Config $template_config
+	 */
+	protected $template_config;
+
+
+	/**
+	 * CoreAssetRegister constructor.
+	 *
+	 * @param AssetCollection    $assets
+	 * @param EE_Currency_Config $currency_config
+	 * @param EE_Template_Config $template_config
+	 * @param DomainInterface    $domain
+	 * @param Registry           $registry
+	 */
+	public function __construct(
+		AssetCollection $assets,
+		EE_Currency_Config $currency_config,
+		EE_Template_Config $template_config,
+		DomainInterface $domain,
+		Registry $registry
+	) {
+		$this->currency_config = $currency_config;
+		$this->template_config = $template_config;
+		parent::__construct($domain, $assets, $registry);
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 */
+	public function addAssets()
+	{
+		$this->addJavascriptFiles();
+		$this->addStylesheetFiles();
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 */
+	public function addJavascriptFiles()
+	{
+		$this->loadCoreJs();
+		$this->loadJqueryValidate();
+		$this->loadAccountingJs();
+		add_action(
+			'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__before_script',
+			array($this, 'loadQtipJs')
+		);
+		$this->registerAdminAssets();
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	public function addStylesheetFiles()
+	{
+		$this->loadCoreCss();
+	}
+
+
+	/**
+	 * core default javascript
+	 *
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 */
+	private function loadCoreJs()
+	{
+		// conditionally load third-party libraries that WP core MIGHT have.
+		$this->registerWpAssets();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_MANIFEST,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'manifest')
+		);
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_JS_CORE,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'eejs'),
+			array(CoreAssetManager::JS_HANDLE_EE_MANIFEST)
+		)
+		->setHasInlineData();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_VENDOR,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'vendor'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_JS_CORE,
+				CoreAssetManager::JS_HANDLE_REACT,
+				CoreAssetManager::JS_HANDLE_REACT_DOM,
+				CoreAssetManager::JS_HANDLE_LODASH,
+			)
+		);
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_VALIDATORS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'validators')
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_HELPERS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'helpers'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_VALIDATORS
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_MODEL,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'model'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_HELPERS
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'valueObjects'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_MODEL
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'data-stores'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_VENDOR,
+				'wp-data',
+				'wp-api-request',
+				CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS
+			)
+		)
+			 ->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_HOC_COMPONENTS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'hocComponents'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
+				CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS,
+				'wp-components',
+			)
+		)->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_COMPONENTS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'components'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
+				CoreAssetManager::JS_HANDLE_EE_VALUE_OBJECTS,
+				'wp-components',
+			)
+		)
+		->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_EDITOR_HOC_COMPONENTS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'editor-hocs'),
+			array(
+				CoreAssetManager::JS_HANDLE_EE_COMPONENTS
+			)
+		)->setRequiresTranslation();
+
+		$this->registry->addData('eejs_api_nonce', wp_create_nonce('wp_rest'));
+		$this->registry->addData(
+			'paths',
+			array(
+				'rest_route' => rest_url('ee/v4.8.36/'),
+				'collection_endpoints' => EED_Core_Rest_Api::getCollectionRoutesIndexedByModelName(),
+				'primary_keys' => EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName(),
+				'site_url' => site_url('/'),
+				'admin_url' => admin_url('/'),
+			)
+		);
+		/** site formatting values **/
+		$this->registry->addData(
+			'site_formats',
+			array(
+				'date_formats' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats()
+			)
+		);
+		/** currency data **/
+		$this->registry->addData(
+			'currency_config',
+			$this->getCurrencySettings()
+		);
+		/** site timezone */
+		$this->registry->addData(
+			'default_timezone',
+			array(
+				'pretty' => EEH_DTT_Helper::get_timezone_string_for_display(),
+				'string' => get_option('timezone_string'),
+				'offset' => EEH_DTT_Helper::get_site_timezone_gmt_offset(),
+			)
+		);
+		/** site locale (user locale if user logged in) */
+		$this->registry->addData(
+			'locale',
+			array(
+				'user' => get_user_locale(),
+				'site' => get_locale()
+			)
+		);
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_CORE,
+			EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+			array(CoreAssetManager::JS_HANDLE_JQUERY)
+		)
+		->setInlineDataCallback(
+			function () {
+				wp_localize_script(
+					CoreAssetManager::JS_HANDLE_EE_CORE,
+					CoreAssetManager::JS_HANDLE_EE_I18N,
+					EE_Registry::$i18n_js_strings
+				);
+			}
+		);
+	}
+
+
+	/**
+	 * Registers vendor files that are bundled with a later version WP but might not be for the current version of
+	 * WordPress in the running environment.
+	 *
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	private function registerWpAssets()
+	{
+		global $wp_version;
+		if (version_compare($wp_version, '5.0.beta', '>=')) {
+			return;
+		}
+		$this->addVendorJavascript(CoreAssetManager::JS_HANDLE_REACT)
+			->setVersion('16.6.0');
+		$this->addVendorJavascript(
+			CoreAssetManager::JS_HANDLE_REACT_DOM,
+			array(CoreAssetManager::JS_HANDLE_REACT)
+		)->setVersion('16.6.0');
+		$this->addVendorJavascript(CoreAssetManager::JS_HANDLE_LODASH)
+			->setInlineDataCallback(
+				function() {
+					wp_add_inline_script(
+						CoreAssetManager::JS_HANDLE_LODASH,
+						'window.lodash = _.noConflict();'
+					);
+				}
+			)
+			->setVersion('4.17.11');
+	}
+
+
+	/**
+	 * Returns configuration data for the accounting-js library.
+	 * @since $VID:$
+	 * @return array
+	 */
+	private function getAccountingSettings() {
+		return array(
+			'currency' => array(
+				'symbol'    => $this->currency_config->sign,
+				'format'    => array(
+					'pos'  => $this->currency_config->sign_b4 ? '%s%v' : '%v%s',
+					'neg'  => $this->currency_config->sign_b4 ? '- %s%v' : '- %v%s',
+					'zero' => $this->currency_config->sign_b4 ? '%s--' : '--%s',
+				),
+				'decimal'   => $this->currency_config->dec_mrk,
+				'thousand'  => $this->currency_config->thsnds,
+				'precision' => $this->currency_config->dec_plc,
+			),
+			'number'   => array(
+				'precision' => $this->currency_config->dec_plc,
+				'thousand'  => $this->currency_config->thsnds,
+				'decimal'   => $this->currency_config->dec_mrk,
+			),
+		);
+	}
+
+
+	/**
+	 * Returns configuration data for the js Currency VO.
+	 * @since $VID:$
+	 * @return array
+	 */
+	private function getCurrencySettings()
+	{
+		return array(
+			'code' => $this->currency_config->code,
+			'singularLabel' => $this->currency_config->name,
+			'pluralLabel' => $this->currency_config->plural,
+			'sign' => $this->currency_config->sign,
+			'signB4' => $this->currency_config->sign_b4,
+			'decimalPlaces' => $this->currency_config->dec_plc,
+			'decimalMark' => $this->currency_config->dec_mrk,
+			'thousandsSeparator' => $this->currency_config->thsnds,
+		);
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function loadCoreCss()
+	{
+		if ($this->template_config->enable_default_style && ! is_admin()) {
+			$this->addStylesheet(
+				CoreAssetManager::CSS_HANDLE_EE_DEFAULT,
+				is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')
+					? EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css'
+					: EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+				array('dashicons')
+			);
+			//Load custom style sheet if available
+			if ($this->template_config->custom_style_sheet !== null) {
+				$this->addStylesheet(
+					CoreAssetManager::CSS_HANDLE_EE_CUSTOM,
+					EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
+					array(CoreAssetManager::CSS_HANDLE_EE_DEFAULT)
+				);
+			}
+		}
+		$this->addStylesheet(
+			CoreAssetManager::CSS_HANDLE_EE_COMPONENTS,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				'components'
+			)
+		);
+	}
+
+
+	/**
+	 * jQuery Validate for form validation
+	 *
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function loadJqueryValidate()
+	{
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
+			array(CoreAssetManager::JS_HANDLE_JQUERY)
+		)
+		->setVersion('1.15.0');
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE_EXTRA,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
+			array(CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE)
+		)
+		->setVersion('1.15.0');
+	}
+
+
+	/**
+	 * accounting.js for performing client-side calculations
+	 *
+	 * @since 4.9.62.p
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function loadAccountingJs()
+	{
+		//accounting.js library
+		// @link http://josscrowcroft.github.io/accounting.js/
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE,
+			EE_THIRD_PARTY_URL . 'accounting/accounting.js',
+			array(CoreAssetManager::JS_HANDLE_UNDERSCORE)
+		)
+		->setVersion('0.3.2');
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
+			EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+			array(CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE)
+		)
+		->setInlineDataCallback(
+			function () {
+				 wp_localize_script(
+					 CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
+					 'EE_ACCOUNTING_CFG',
+					 $this->getAccountingSettings()
+				 );
+			}
+		)
+		->setVersion();
+	}
+
+
+	/**
+	 * registers assets for cleaning your ears
+	 *
+	 * @param JavascriptAsset $script
+	 */
+	public function loadQtipJs(JavascriptAsset $script)
+	{
+		// qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
+		// can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
+		if (
+			$script->handle() === CoreAssetManager::JS_HANDLE_EE_WP_PLUGINS_PAGE
+			&& apply_filters('FHEE_load_qtip', false)
+		) {
+			EEH_Qtip_Loader::instance()->register_and_enqueue();
+		}
+	}
+
+
+	/**
+	 * assets that are used in the WordPress admin
+	 *
+	 * @since 4.9.62.p
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function registerAdminAssets()
+	{
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_WP_PLUGINS_PAGE,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'wp-plugins-page'),
+			array(
+				CoreAssetManager::JS_HANDLE_JQUERY,
+				CoreAssetManager::JS_HANDLE_EE_VENDOR,
+			)
+		)
+		->setRequiresTranslation();
+
+		$this->addStylesheet(
+			CoreAssetManager::JS_HANDLE_EE_WP_PLUGINS_PAGE,
+			$this->registry->getCssUrl($this->domain->assetNamespace(), 'wp-plugins-page')
+		);
+	}
 }

core/services/assets/BlockAssetManager.php

Indentation +305 added lines, -305 removed lines

@@ -22,310 +22,310 @@
 abstract class BlockAssetManager extends AssetManager implements BlockAssetManagerInterface
 {
 
-    /**
-     * @var string $editor_script_handle
-     */
-    private $editor_script_handle;
-
-    /**
-     * @var string $editor_style_handle
-     */
-    private $editor_style_handle;
-
-    /**
-     * @var string $script_handle
-     */
-    private $script_handle;
-
-    /**
-     * @var string $style_handle
-     */
-    private $style_handle;
-
-
-    /**
-     * @return string
-     */
-    public function getEditorScriptHandle()
-    {
-        return $this->editor_script_handle;
-    }
-
-
-    /**
-     * @param string $editor_script_handle
-     */
-    public function setEditorScriptHandle($editor_script_handle)
-    {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
-        }
-        $this->editor_script_handle = $editor_script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getEditorStyleHandle()
-    {
-        return $this->editor_style_handle;
-    }
-
-
-    /**
-     * @param string $editor_style_handle
-     */
-    public function setEditorStyleHandle($editor_style_handle)
-    {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
-        }
-        $this->editor_style_handle = $editor_style_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getScriptHandle()
-    {
-        return $this->script_handle;
-    }
-
-
-    /**
-     * @param string $script_handle
-     */
-    public function setScriptHandle($script_handle)
-    {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
-        }
-        $this->script_handle = $script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getStyleHandle()
-    {
-        return $this->style_handle;
-    }
-
-
-    /**
-     * @param string $style_handle
-     */
-    public function setStyleHandle($style_handle)
-    {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
-        }
-        $this->style_handle = $style_handle;
-    }
-
-    /**
-     * @since $VID:$
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addAssets()
-    {
-        $this->addEditorScript($this->getEditorScriptHandle());
-        $this->addEditorStyle($this->getEditorStyleHandle());
-        $this->addScript($this->getScriptHandle());
-        $this->addStyle($this->getStyleHandle());
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since $VID:$
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorScript($handle, array $dependencies = array())
-    {
-        if($this->assets->hasJavascriptAsset($handle)){
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockScriptDependencies($dependencies)
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since $VID:$
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockStyleDependencies($dependencies)
-        );
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since $VID:$
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addScript($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasJavascriptAsset($handle)) {
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies + array( CoreAssetManager::JS_HANDLE_EE_COMPONENTS )
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since $VID:$
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies + array( CoreAssetManager::CSS_HANDLE_EE_COMPONENTS )
-        );
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockScriptDependencies(array $dependencies)
-    {
-        $dependencies += array(
-                'wp-blocks',    // Provides useful functions and components for extending the editor
-                'wp-i18n',      // Provides localization functions
-                'wp-element',   // Provides React.Component
-                'wp-components', // Provides many prebuilt components and controls
-                CoreAssetManager::JS_HANDLE_EE_EDITOR_HOC_COMPONENTS,
-                $this->getScriptHandle(),
-            );
-        return $dependencies;
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockStyleDependencies(array $dependencies)
-    {
-        $dependencies += array(
-            $this->getStyleHandle()
-        );
-        return $dependencies;
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getEditorScript()
-    {
-        return $this->assets->getJavascriptAsset($this->editor_script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getEditorStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->editor_style_handle);
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getScript()
-    {
-        return $this->assets->getJavascriptAsset($this->script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->style_handle);
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function enqueueAssets()
-    {
-        $assets = array(
-            $this->getEditorScript(),
-            $this->getEditorStyle(),
-            $this->getScript(),
-            $this->getStyle(),
-        );
-        foreach ($assets as $asset) {
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-            }
-        }
-    }
+	/**
+	 * @var string $editor_script_handle
+	 */
+	private $editor_script_handle;
+
+	/**
+	 * @var string $editor_style_handle
+	 */
+	private $editor_style_handle;
+
+	/**
+	 * @var string $script_handle
+	 */
+	private $script_handle;
+
+	/**
+	 * @var string $style_handle
+	 */
+	private $style_handle;
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorScriptHandle()
+	{
+		return $this->editor_script_handle;
+	}
+
+
+	/**
+	 * @param string $editor_script_handle
+	 */
+	public function setEditorScriptHandle($editor_script_handle)
+	{
+		if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+		}
+		$this->editor_script_handle = $editor_script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorStyleHandle()
+	{
+		return $this->editor_style_handle;
+	}
+
+
+	/**
+	 * @param string $editor_style_handle
+	 */
+	public function setEditorStyleHandle($editor_style_handle)
+	{
+		if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+		}
+		$this->editor_style_handle = $editor_style_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getScriptHandle()
+	{
+		return $this->script_handle;
+	}
+
+
+	/**
+	 * @param string $script_handle
+	 */
+	public function setScriptHandle($script_handle)
+	{
+		if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+		}
+		$this->script_handle = $script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getStyleHandle()
+	{
+		return $this->style_handle;
+	}
+
+
+	/**
+	 * @param string $style_handle
+	 */
+	public function setStyleHandle($style_handle)
+	{
+		if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+		}
+		$this->style_handle = $style_handle;
+	}
+
+	/**
+	 * @since $VID:$
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addAssets()
+	{
+		$this->addEditorScript($this->getEditorScriptHandle());
+		$this->addEditorStyle($this->getEditorStyleHandle());
+		$this->addScript($this->getScriptHandle());
+		$this->addStyle($this->getStyleHandle());
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since $VID:$
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorScript($handle, array $dependencies = array())
+	{
+		if($this->assets->hasJavascriptAsset($handle)){
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockScriptDependencies($dependencies)
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since $VID:$
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockStyleDependencies($dependencies)
+		);
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since $VID:$
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addScript($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasJavascriptAsset($handle)) {
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies + array( CoreAssetManager::JS_HANDLE_EE_COMPONENTS )
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since $VID:$
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies + array( CoreAssetManager::CSS_HANDLE_EE_COMPONENTS )
+		);
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockScriptDependencies(array $dependencies)
+	{
+		$dependencies += array(
+				'wp-blocks',    // Provides useful functions and components for extending the editor
+				'wp-i18n',      // Provides localization functions
+				'wp-element',   // Provides React.Component
+				'wp-components', // Provides many prebuilt components and controls
+				CoreAssetManager::JS_HANDLE_EE_EDITOR_HOC_COMPONENTS,
+				$this->getScriptHandle(),
+			);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockStyleDependencies(array $dependencies)
+	{
+		$dependencies += array(
+			$this->getStyleHandle()
+		);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getEditorScript()
+	{
+		return $this->assets->getJavascriptAsset($this->editor_script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getEditorStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->editor_style_handle);
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getScript()
+	{
+		return $this->assets->getJavascriptAsset($this->script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->style_handle);
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function enqueueAssets()
+	{
+		$assets = array(
+			$this->getEditorScript(),
+			$this->getEditorStyle(),
+			$this->getScript(),
+			$this->getStyle(),
+		);
+		foreach ($assets as $asset) {
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+			}
+		}
+	}
 
 }

Spacing +14 added lines, -14 removed lines

@@ -57,8 +57,8 @@ 
      */
     public function setEditorScriptHandle($editor_script_handle)
     {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+        if (strpos($editor_script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_script_handle = BlockInterface::NAME_SPACE.'-'.$editor_script_handle;
         }
         $this->editor_script_handle = $editor_script_handle;
     }
@@ -78,8 +78,8 @@ 
      */
     public function setEditorStyleHandle($editor_style_handle)
     {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_style_handle = BlockInterface::NAME_SPACE.'-'.$editor_style_handle;
         }
         $this->editor_style_handle = $editor_style_handle;
     }
@@ -99,8 +99,8 @@ 
      */
     public function setScriptHandle($script_handle)
     {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+        if (strpos($script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $script_handle = BlockInterface::NAME_SPACE.'-'.$script_handle;
         }
         $this->script_handle = $script_handle;
     }
@@ -120,8 +120,8 @@ 
      */
     public function setStyleHandle($style_handle)
     {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+        if (strpos($style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $style_handle = BlockInterface::NAME_SPACE.'-'.$style_handle;
         }
         $this->style_handle = $style_handle;
     }
@@ -152,7 +152,7 @@ 
      */
     public function addEditorScript($handle, array $dependencies = array())
     {
-        if($this->assets->hasJavascriptAsset($handle)){
+        if ($this->assets->hasJavascriptAsset($handle)) {
             return $this->assets->getJavascriptAsset($handle);
         }
         return parent::addJavascript(
@@ -212,7 +212,7 @@ 
                 $this->domain->assetNamespace(),
                 $handle
             ),
-            $dependencies + array( CoreAssetManager::JS_HANDLE_EE_COMPONENTS )
+            $dependencies + array(CoreAssetManager::JS_HANDLE_EE_COMPONENTS)
         )
         ->setRequiresTranslation();
     }
@@ -238,7 +238,7 @@ 
                 $this->domain->assetNamespace(),
                 $handle
             ),
-            $dependencies + array( CoreAssetManager::CSS_HANDLE_EE_COMPONENTS )
+            $dependencies + array(CoreAssetManager::CSS_HANDLE_EE_COMPONENTS)
         );
     }
 
@@ -250,9 +250,9 @@ 
     protected function addDefaultBlockScriptDependencies(array $dependencies)
     {
         $dependencies += array(
-                'wp-blocks',    // Provides useful functions and components for extending the editor
-                'wp-i18n',      // Provides localization functions
-                'wp-element',   // Provides React.Component
+                'wp-blocks', // Provides useful functions and components for extending the editor
+                'wp-i18n', // Provides localization functions
+                'wp-element', // Provides React.Component
                 'wp-components', // Provides many prebuilt components and controls
                 CoreAssetManager::JS_HANDLE_EE_EDITOR_HOC_COMPONENTS,
                 $this->getScriptHandle(),