eventespresso / event-espresso-core

core/domain/services/assets/CoreAssetManager.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
 
     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';
 
@@ -183,7 +183,7 @@ 
             //js.api
             $this->addJavascript(
                 CoreAssetManager::JS_HANDLE_EE_JS_API,
-                EE_LIBRARIES_URL . 'rest_api/assets/js/eejs-api.min.js',
+                EE_LIBRARIES_URL.'rest_api/assets/js/eejs-api.min.js',
                 array(
                     CoreAssetManager::JS_HANDLE_UNDERSCORE,
                     CoreAssetManager::JS_HANDLE_EE_JS_CORE
@@ -202,11 +202,11 @@ 
 
         $this->addJavascript(
             CoreAssetManager::JS_HANDLE_EE_CORE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js',
             array(CoreAssetManager::JS_HANDLE_JQUERY)
         )
         ->setInlineDataCallback(
-            function () {
+            function() {
                 wp_localize_script(
                     CoreAssetManager::JS_HANDLE_EE_CORE,
                     CoreAssetManager::JS_HANDLE_EE_I18N,
@@ -228,16 +228,16 @@ 
         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')
+                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',
+                    : 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,
+                    EVENT_ESPRESSO_UPLOAD_URL.'css/'.$this->template_config->custom_style_sheet,
                     array(CoreAssetManager::CSS_HANDLE_EE_DEFAULT)
                 );
             }
@@ -257,14 +257,14 @@ 
     {
         $this->addJavascript(
             CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
+            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',
+            EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.additional-methods.min.js',
             array(CoreAssetManager::JS_HANDLE_JQUERY_VALIDATE)
         )
         ->setVersion('1.15.0');
@@ -285,7 +285,7 @@ 
         // @link http://josscrowcroft.github.io/accounting.js/
         $this->addJavascript(
             CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE,
-            EE_THIRD_PARTY_URL . 'accounting/accounting.js',
+            EE_THIRD_PARTY_URL.'accounting/accounting.js',
             array(CoreAssetManager::JS_HANDLE_UNDERSCORE)
         )
         ->setVersion('0.3.2');
@@ -293,11 +293,11 @@ 
         $currency_config = $this->currency_config;
         $this->addJavascript(
             CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
-            EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js',
             array(CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE)
         )
         ->setInlineDataCallback(
-            function () use ($currency_config) {
+            function() use ($currency_config) {
                  wp_localize_script(
                      CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
                      'EE_ACCOUNTING_CFG',

Indentation +347 added lines, -347 removed lines

@@ -28,354 +28,354 @@
 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_ACCOUNTING_CORE       = 'ee-accounting-core';
-
-    // EE JS assets handles
-    const JS_HANDLE_EE_MANIFEST        = 'ee-manifest';
-
-    const JS_HANDLE_EE_JS_CORE         = 'eejs-core';
-
-    const JS_HANDLE_EE_VENDOR           = 'eventespresso-vendor';
-
-    const JS_HANDLE_EE_DATA_STORES     = 'eventespresso-data-stores';
-
-    const JS_HANDLE_EE_COMPONENTS      = 'eventespresso-components';
-
-    const JS_HANDLE_EE_JS_API          = 'eejs-api';
-
-    const JS_HANDLE_EE_CORE            = 'espresso_core';
-
-    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';
-
-    /**
-     * @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 DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    public function addAssets()
-    {
-        $this->addJavascriptFiles();
-        $this->addStylesheetFiles();
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    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 DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    private function loadCoreJs()
-    {
-        $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)
-        );
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'data-stores'),
-            array(CoreAssetManager::JS_HANDLE_EE_VENDOR, 'wp-data')
-        )
-        ->setRequiresTranslation();
-
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_COMPONENTS,
-            $this->registry->getJsUrl($this->domain->assetNamespace(), 'components'),
-            array(CoreAssetManager::JS_HANDLE_EE_DATA_STORES)
-        )
-        ->setRequiresTranslation();
-
-        global $wp_version;
-        if (version_compare($wp_version, '4.4.0', '>')) {
-            //js.api
-            $this->addJavascript(
-                CoreAssetManager::JS_HANDLE_EE_JS_API,
-                EE_LIBRARIES_URL . 'rest_api/assets/js/eejs-api.min.js',
-                array(
-                    CoreAssetManager::JS_HANDLE_UNDERSCORE,
-                    CoreAssetManager::JS_HANDLE_EE_JS_CORE
-                )
-            );
-            $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()
-                )
-            );
-        }
-
-        $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
-                );
-            }
-        );
-    }
-
-
-    /**
-     * @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)
-                );
-            }
-        }
-    }
-
-
-    /**
-     * jQuery Validate for form validation
-     *
-     * @since 4.9.62.p
-     * @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 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');
-
-        $currency_config = $this->currency_config;
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
-            EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
-            array(CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE)
-        )
-        ->setInlineDataCallback(
-            function () use ($currency_config) {
-                 wp_localize_script(
-                     CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
-                     'EE_ACCOUNTING_CFG',
-                     array(
-                         'currency' => array(
-                             'symbol'    => $currency_config->sign,
-                             'format'    => array(
-                                 'pos'  => $currency_config->sign_b4 ? '%s%v' : '%v%s',
-                                 'neg'  => $currency_config->sign_b4 ? '- %s%v' : '- %v%s',
-                                 'zero' => $currency_config->sign_b4 ? '%s--' : '--%s',
-                             ),
-                             'decimal'   => $currency_config->dec_mrk,
-                             'thousand'  => $currency_config->thsnds,
-                             'precision' => $currency_config->dec_plc,
-                         ),
-                         'number'   => array(
-                             'precision' => $currency_config->dec_plc,
-                             'thousand'  => $currency_config->thsnds,
-                             'decimal'   => $currency_config->dec_mrk,
-                         ),
-                     )
-                 );
-            }
-        )
-        ->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_UNDERSCORE            = 'underscore';
+
+	const JS_HANDLE_ACCOUNTING_CORE       = 'ee-accounting-core';
+
+	// EE JS assets handles
+	const JS_HANDLE_EE_MANIFEST        = 'ee-manifest';
+
+	const JS_HANDLE_EE_JS_CORE         = 'eejs-core';
+
+	const JS_HANDLE_EE_VENDOR           = 'eventespresso-vendor';
+
+	const JS_HANDLE_EE_DATA_STORES     = 'eventespresso-data-stores';
+
+	const JS_HANDLE_EE_COMPONENTS      = 'eventespresso-components';
+
+	const JS_HANDLE_EE_JS_API          = 'eejs-api';
+
+	const JS_HANDLE_EE_CORE            = 'espresso_core';
+
+	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';
+
+	/**
+	 * @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 DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	public function addAssets()
+	{
+		$this->addJavascriptFiles();
+		$this->addStylesheetFiles();
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	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 DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	private function loadCoreJs()
+	{
+		$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)
+		);
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_DATA_STORES,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'data-stores'),
+			array(CoreAssetManager::JS_HANDLE_EE_VENDOR, 'wp-data')
+		)
+		->setRequiresTranslation();
+
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_COMPONENTS,
+			$this->registry->getJsUrl($this->domain->assetNamespace(), 'components'),
+			array(CoreAssetManager::JS_HANDLE_EE_DATA_STORES)
+		)
+		->setRequiresTranslation();
+
+		global $wp_version;
+		if (version_compare($wp_version, '4.4.0', '>')) {
+			//js.api
+			$this->addJavascript(
+				CoreAssetManager::JS_HANDLE_EE_JS_API,
+				EE_LIBRARIES_URL . 'rest_api/assets/js/eejs-api.min.js',
+				array(
+					CoreAssetManager::JS_HANDLE_UNDERSCORE,
+					CoreAssetManager::JS_HANDLE_EE_JS_CORE
+				)
+			);
+			$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()
+				)
+			);
+		}
+
+		$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
+				);
+			}
+		);
+	}
+
+
+	/**
+	 * @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)
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * jQuery Validate for form validation
+	 *
+	 * @since 4.9.62.p
+	 * @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 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');
+
+		$currency_config = $this->currency_config;
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
+			EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+			array(CoreAssetManager::JS_HANDLE_ACCOUNTING_CORE)
+		)
+		->setInlineDataCallback(
+			function () use ($currency_config) {
+				 wp_localize_script(
+					 CoreAssetManager::JS_HANDLE_EE_ACCOUNTING,
+					 'EE_ACCOUNTING_CFG',
+					 array(
+						 'currency' => array(
+							 'symbol'    => $currency_config->sign,
+							 'format'    => array(
+								 'pos'  => $currency_config->sign_b4 ? '%s%v' : '%v%s',
+								 'neg'  => $currency_config->sign_b4 ? '- %s%v' : '- %v%s',
+								 'zero' => $currency_config->sign_b4 ? '%s--' : '--%s',
+							 ),
+							 'decimal'   => $currency_config->dec_mrk,
+							 'thousand'  => $currency_config->thsnds,
+							 'precision' => $currency_config->dec_plc,
+						 ),
+						 'number'   => array(
+							 'precision' => $currency_config->dec_plc,
+							 'thousand'  => $currency_config->thsnds,
+							 'decimal'   => $currency_config->dec_mrk,
+						 ),
+					 )
+				 );
+			}
+		)
+		->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->setScriptHandle($this->getScriptHandle());
-        $this->setStyleHandle($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->has($handle)){
-            return $this->assets->get($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->has($handle)) {
-            return $this->assets->get($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $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->has($handle)) {
-            return $this->assets->get($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 addStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->has($handle)) {
-            return $this->assets->get($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies
-        );
-    }
-
-
-    /**
-     * @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_COMPONENTS
-            );
-        return $dependencies;
-    }
-
-
-    /**
-     * @param string $handle
-     * @since $VID:$
-     * @return mixed|null
-     */
-    public function getAsset($handle)
-    {
-        if ($this->assets->has($handle)) {
-            return $this->assets->get($handle);
-        }
-        return null;
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getEditorScript()
-    {
-        return $this->getAsset($this->editor_script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getEditorStyle()
-    {
-        return $this->getAsset($this->editor_style_handle);
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getScript()
-    {
-        return $this->getAsset($this->script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getStyle()
-    {
-        return $this->getAsset($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->setScriptHandle($this->getScriptHandle());
+		$this->setStyleHandle($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->has($handle)){
+			return $this->assets->get($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->has($handle)) {
+			return $this->assets->get($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$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->has($handle)) {
+			return $this->assets->get($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 addStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->has($handle)) {
+			return $this->assets->get($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies
+		);
+	}
+
+
+	/**
+	 * @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_COMPONENTS
+			);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @since $VID:$
+	 * @return mixed|null
+	 */
+	public function getAsset($handle)
+	{
+		if ($this->assets->has($handle)) {
+			return $this->assets->get($handle);
+		}
+		return null;
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getEditorScript()
+	{
+		return $this->getAsset($this->editor_script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getEditorStyle()
+	{
+		return $this->getAsset($this->editor_style_handle);
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getScript()
+	{
+		return $this->getAsset($this->script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getStyle()
+	{
+		return $this->getAsset($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 +12 added lines, -12 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->has($handle)){
+        if ($this->assets->has($handle)) {
             return $this->assets->get($handle);
         }
         return parent::addJavascript(
@@ -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_COMPONENTS
             );