Inspection of "Fix block asset registration for frontend scripts/..." - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — Gutenberg/master (#756)

by Darren

created 2018-10-30 00:53 UTC

Status

Indentation +291 added lines, -291 removed lines patch added patch discarded remove patch

@@ -22,296 +22,296 @@
 block discarded – undo
 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->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
-            ),
-            $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
-        )
-        ->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
-        );
-    }
-
-
-    /**
-     * @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;
-    }
-
-
-    /**
-     * @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->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->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
+			),
+			$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
+		)
+		->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
+		);
+	}
+
+
+	/**
+	 * @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;
+	}
+
+
+	/**
+	 * @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();
+			}
+		}
+	}
 
 }

Please login to merge, or discard this patch.

core/domain/entities/editor/CoreBlocksAssetManager.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -14,20 +14,20 @@
 block discarded – undo
  */
 class CoreBlocksAssetManager extends BlockAssetManager
 {
-    const JS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
-    const CSS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
-    const JS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
-    const CSS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
+	const JS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
+	const CSS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
+	const JS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
+	const CSS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
 
 
-    /**
-     * @since $VID:$
-     */
-    public function setAssetHandles()
-    {
-        $this->setEditorScriptHandle(self::JS_HANDLE_CORE_BLOCKS_EDITOR);
-        $this->setEditorStyleHandle(self::CSS_HANDLE_CORE_BLOCKS_EDITOR);
-        $this->setScriptHandle(self::JS_HANDLE_CORE_BLOCKS);
-        $this->setStyleHandle(self::CSS_HANDLE_CORE_BLOCKS);
-    }
+	/**
+	 * @since $VID:$
+	 */
+	public function setAssetHandles()
+	{
+		$this->setEditorScriptHandle(self::JS_HANDLE_CORE_BLOCKS_EDITOR);
+		$this->setEditorStyleHandle(self::CSS_HANDLE_CORE_BLOCKS_EDITOR);
+		$this->setScriptHandle(self::JS_HANDLE_CORE_BLOCKS);
+		$this->setStyleHandle(self::CSS_HANDLE_CORE_BLOCKS);
+	}
 }

Please login to merge, or discard this patch.

		@@ -22,296 +22,296 @@
		block discarded – undo
22	22	abstract class BlockAssetManager extends AssetManager implements BlockAssetManagerInterface
23	23	{
24	24
25		- /**
26		- * @var string $editor_script_handle
27		- */
28		- private $editor_script_handle;
29		-
30		- /**
31		- * @var string $editor_style_handle
32		- */
33		- private $editor_style_handle;
34		-
35		- /**
36		- * @var string $script_handle
37		- */
38		- private $script_handle;
39		-
40		- /**
41		- * @var string $style_handle
42		- */
43		- private $style_handle;
44		-
45		-
46		- /**
47		- * @return string
48		- */
49		- public function getEditorScriptHandle()
50		- {
51		- return $this->editor_script_handle;
52		- }
53		-
54		-
55		- /**
56		- * @param string $editor_script_handle
57		- */
58		- public function setEditorScriptHandle($editor_script_handle)
59		- {
60		- if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
61		- $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
62		- }
63		- $this->editor_script_handle = $editor_script_handle;
64		- }
65		-
66		-
67		- /**
68		- * @return string
69		- */
70		- public function getEditorStyleHandle()
71		- {
72		- return $this->editor_style_handle;
73		- }
74		-
75		-
76		- /**
77		- * @param string $editor_style_handle
78		- */
79		- public function setEditorStyleHandle($editor_style_handle)
80		- {
81		- if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
82		- $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
83		- }
84		- $this->editor_style_handle = $editor_style_handle;
85		- }
86		-
87		-
88		- /**
89		- * @return string
90		- */
91		- public function getScriptHandle()
92		- {
93		- return $this->script_handle;
94		- }
95		-
96		-
97		- /**
98		- * @param string $script_handle
99		- */
100		- public function setScriptHandle($script_handle)
101		- {
102		- if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
103		- $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
104		- }
105		- $this->script_handle = $script_handle;
106		- }
107		-
108		-
109		- /**
110		- * @return string
111		- */
112		- public function getStyleHandle()
113		- {
114		- return $this->style_handle;
115		- }
116		-
117		-
118		- /**
119		- * @param string $style_handle
120		- */
121		- public function setStyleHandle($style_handle)
122		- {
123		- if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
124		- $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
125		- }
126		- $this->style_handle = $style_handle;
127		- }
128		-
129		- /**
130		- * @since $VID:$
131		- * @throws InvalidDataTypeException
132		- * @throws InvalidEntityException
133		- * @throws DuplicateCollectionIdentifierException
134		- */
135		- public function addAssets()
136		- {
137		- $this->addEditorScript($this->getEditorScriptHandle());
138		- $this->addEditorStyle($this->getEditorStyleHandle());
139		- $this->setScriptHandle($this->getScriptHandle());
140		- $this->setStyleHandle($this->getStyleHandle());
141		- }
142		-
143		-
144		- /**
145		- * @param $handle
146		- * @param array $dependencies
147		- * @since $VID:$
148		- * @return JavascriptAsset
149		- * @throws InvalidDataTypeException
150		- * @throws InvalidEntityException
151		- * @throws DuplicateCollectionIdentifierException
152		- */
153		- public function addEditorScript($handle, array $dependencies = array())
154		- {
155		- if($this->assets->hasJavascriptAsset($handle)){
156		- return $this->assets->getJavascriptAsset($handle);
157		- }
158		- return parent::addJavascript(
159		- $handle,
160		- $this->registry->getJsUrl(
161		- $this->domain->assetNamespace(),
162		- $handle
163		- ),
164		- $this->addDefaultBlockScriptDependencies($dependencies)
165		- )
166		- ->setRequiresTranslation();
167		- }
168		-
169		-
170		- /**
171		- * @param $handle
172		- * @param array $dependencies
173		- * @since $VID:$
174		- * @return StylesheetAsset
175		- * @throws InvalidDataTypeException
176		- * @throws InvalidEntityException
177		- * @throws DuplicateCollectionIdentifierException
178		- */
179		- public function addEditorStyle($handle, array $dependencies = array())
180		- {
181		- if ($this->assets->hasStylesheetAsset($handle)) {
182		- return $this->assets->getStylesheetAsset($handle);
183		- }
184		- return parent::addStylesheet(
185		- $handle,
186		- $this->registry->getCssUrl(
187		- $this->domain->assetNamespace(),
188		- $handle
189		- ),
190		- $dependencies
191		- );
192		- }
193		-
194		-
195		- /**
196		- * @param $handle
197		- * @param array $dependencies
198		- * @since $VID:$
199		- * @return JavascriptAsset
200		- * @throws InvalidDataTypeException
201		- * @throws InvalidEntityException
202		- * @throws DuplicateCollectionIdentifierException
203		- */
204		- public function addScript($handle, array $dependencies = array())
205		- {
206		- if ($this->assets->hasJavascriptAsset($handle)) {
207		- return $this->assets->getJavascriptAsset($handle);
208		- }
209		- return parent::addJavascript(
210		- $handle,
211		- $this->registry->getJsUrl(
212		- $this->domain->assetNamespace(),
213		- $handle
214		- ),
215		- $dependencies
216		- )
217		- ->setRequiresTranslation();
218		- }
219		-
220		-
221		- /**
222		- * @param $handle
223		- * @param array $dependencies
224		- * @since $VID:$
225		- * @return StylesheetAsset
226		- * @throws InvalidDataTypeException
227		- * @throws InvalidEntityException
228		- * @throws DuplicateCollectionIdentifierException
229		- */
230		- public function addStyle($handle, array $dependencies = array())
231		- {
232		- if ($this->assets->hasStylesheetAsset($handle)) {
233		- return $this->assets->getStylesheetAsset($handle);
234		- }
235		- return parent::addStylesheet(
236		- $handle,
237		- $this->registry->getCssUrl(
238		- $this->domain->assetNamespace(),
239		- $handle
240		- ),
241		- $dependencies
242		- );
243		- }
244		-
245		-
246		- /**
247		- * @param array $dependencies
248		- * @return array
249		- */
250		- protected function addDefaultBlockScriptDependencies(array $dependencies)
251		- {
252		- $dependencies += array(
253		- 'wp-blocks', // Provides useful functions and components for extending the editor
254		- 'wp-i18n', // Provides localization functions
255		- 'wp-element', // Provides React.Component
256		- 'wp-components', // Provides many prebuilt components and controls
257		- CoreAssetManager::JS_HANDLE_EE_COMPONENTS
258		- );
259		- return $dependencies;
260		- }
261		-
262		-
263		- /**
264		- * @return JavascriptAsset\|null
265		- */
266		- public function getEditorScript()
267		- {
268		- return $this->assets->getJavascriptAsset($this->editor_script_handle);
269		- }
270		-
271		-
272		- /**
273		- * @return StylesheetAsset\|null
274		- */
275		- public function getEditorStyle()
276		- {
277		- return $this->assets->getStylesheetAsset($this->editor_style_handle);
278		- }
279		-
280		-
281		- /**
282		- * @return JavascriptAsset\|null
283		- */
284		- public function getScript()
285		- {
286		- return $this->assets->getJavascriptAsset($this->script_handle);
287		- }
288		-
289		-
290		- /**
291		- * @return StylesheetAsset\|null
292		- */
293		- public function getStyle()
294		- {
295		- return $this->assets->getStylesheetAsset($this->style_handle);
296		- }
297		-
298		-
299		- /**
300		- * @return void
301		- */
302		- public function enqueueAssets()
303		- {
304		- $assets = array(
305		- $this->getEditorScript(),
306		- $this->getEditorStyle(),
307		- $this->getScript(),
308		- $this->getStyle(),
309		- );
310		- foreach ($assets as $asset) {
311		- if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
312		- $asset->enqueueAsset();
313		- }
314		- }
315		- }
	25	+ /**
	26	+ * @var string $editor_script_handle
	27	+ */
	28	+ private $editor_script_handle;
	29	+
	30	+ /**
	31	+ * @var string $editor_style_handle
	32	+ */
	33	+ private $editor_style_handle;
	34	+
	35	+ /**
	36	+ * @var string $script_handle
	37	+ */
	38	+ private $script_handle;
	39	+
	40	+ /**
	41	+ * @var string $style_handle
	42	+ */
	43	+ private $style_handle;
	44	+
	45	+
	46	+ /**
	47	+ * @return string
	48	+ */
	49	+ public function getEditorScriptHandle()
	50	+ {
	51	+ return $this->editor_script_handle;
	52	+ }
	53	+
	54	+
	55	+ /**
	56	+ * @param string $editor_script_handle
	57	+ */
	58	+ public function setEditorScriptHandle($editor_script_handle)
	59	+ {
	60	+ if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	61	+ $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
	62	+ }
	63	+ $this->editor_script_handle = $editor_script_handle;
	64	+ }
	65	+
	66	+
	67	+ /**
	68	+ * @return string
	69	+ */
	70	+ public function getEditorStyleHandle()
	71	+ {
	72	+ return $this->editor_style_handle;
	73	+ }
	74	+
	75	+
	76	+ /**
	77	+ * @param string $editor_style_handle
	78	+ */
	79	+ public function setEditorStyleHandle($editor_style_handle)
	80	+ {
	81	+ if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	82	+ $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
	83	+ }
	84	+ $this->editor_style_handle = $editor_style_handle;
	85	+ }
	86	+
	87	+
	88	+ /**
	89	+ * @return string
	90	+ */
	91	+ public function getScriptHandle()
	92	+ {
	93	+ return $this->script_handle;
	94	+ }
	95	+
	96	+
	97	+ /**
	98	+ * @param string $script_handle
	99	+ */
	100	+ public function setScriptHandle($script_handle)
	101	+ {
	102	+ if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	103	+ $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
	104	+ }
	105	+ $this->script_handle = $script_handle;
	106	+ }
	107	+
	108	+
	109	+ /**
	110	+ * @return string
	111	+ */
	112	+ public function getStyleHandle()
	113	+ {
	114	+ return $this->style_handle;
	115	+ }
	116	+
	117	+
	118	+ /**
	119	+ * @param string $style_handle
	120	+ */
	121	+ public function setStyleHandle($style_handle)
	122	+ {
	123	+ if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	124	+ $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
	125	+ }
	126	+ $this->style_handle = $style_handle;
	127	+ }
	128	+
	129	+ /**
	130	+ * @since $VID:$
	131	+ * @throws InvalidDataTypeException
	132	+ * @throws InvalidEntityException
	133	+ * @throws DuplicateCollectionIdentifierException
	134	+ */
	135	+ public function addAssets()
	136	+ {
	137	+ $this->addEditorScript($this->getEditorScriptHandle());
	138	+ $this->addEditorStyle($this->getEditorStyleHandle());
	139	+ $this->setScriptHandle($this->getScriptHandle());
	140	+ $this->setStyleHandle($this->getStyleHandle());
	141	+ }
	142	+
	143	+
	144	+ /**
	145	+ * @param $handle
	146	+ * @param array $dependencies
	147	+ * @since $VID:$
	148	+ * @return JavascriptAsset
	149	+ * @throws InvalidDataTypeException
	150	+ * @throws InvalidEntityException
	151	+ * @throws DuplicateCollectionIdentifierException
	152	+ */
	153	+ public function addEditorScript($handle, array $dependencies = array())
	154	+ {
	155	+ if($this->assets->hasJavascriptAsset($handle)){
	156	+ return $this->assets->getJavascriptAsset($handle);
	157	+ }
	158	+ return parent::addJavascript(
	159	+ $handle,
	160	+ $this->registry->getJsUrl(
	161	+ $this->domain->assetNamespace(),
	162	+ $handle
	163	+ ),
	164	+ $this->addDefaultBlockScriptDependencies($dependencies)
	165	+ )
	166	+ ->setRequiresTranslation();
	167	+ }
	168	+
	169	+
	170	+ /**
	171	+ * @param $handle
	172	+ * @param array $dependencies
	173	+ * @since $VID:$
	174	+ * @return StylesheetAsset
	175	+ * @throws InvalidDataTypeException
	176	+ * @throws InvalidEntityException
	177	+ * @throws DuplicateCollectionIdentifierException
	178	+ */
	179	+ public function addEditorStyle($handle, array $dependencies = array())
	180	+ {
	181	+ if ($this->assets->hasStylesheetAsset($handle)) {
	182	+ return $this->assets->getStylesheetAsset($handle);
	183	+ }
	184	+ return parent::addStylesheet(
	185	+ $handle,
	186	+ $this->registry->getCssUrl(
	187	+ $this->domain->assetNamespace(),
	188	+ $handle
	189	+ ),
	190	+ $dependencies
	191	+ );
	192	+ }
	193	+
	194	+
	195	+ /**
	196	+ * @param $handle
	197	+ * @param array $dependencies
	198	+ * @since $VID:$
	199	+ * @return JavascriptAsset
	200	+ * @throws InvalidDataTypeException
	201	+ * @throws InvalidEntityException
	202	+ * @throws DuplicateCollectionIdentifierException
	203	+ */
	204	+ public function addScript($handle, array $dependencies = array())
	205	+ {
	206	+ if ($this->assets->hasJavascriptAsset($handle)) {
	207	+ return $this->assets->getJavascriptAsset($handle);
	208	+ }
	209	+ return parent::addJavascript(
	210	+ $handle,
	211	+ $this->registry->getJsUrl(
	212	+ $this->domain->assetNamespace(),
	213	+ $handle
	214	+ ),
	215	+ $dependencies
	216	+ )
	217	+ ->setRequiresTranslation();
	218	+ }
	219	+
	220	+
	221	+ /**
	222	+ * @param $handle
	223	+ * @param array $dependencies
	224	+ * @since $VID:$
	225	+ * @return StylesheetAsset
	226	+ * @throws InvalidDataTypeException
	227	+ * @throws InvalidEntityException
	228	+ * @throws DuplicateCollectionIdentifierException
	229	+ */
	230	+ public function addStyle($handle, array $dependencies = array())
	231	+ {
	232	+ if ($this->assets->hasStylesheetAsset($handle)) {
	233	+ return $this->assets->getStylesheetAsset($handle);
	234	+ }
	235	+ return parent::addStylesheet(
	236	+ $handle,
	237	+ $this->registry->getCssUrl(
	238	+ $this->domain->assetNamespace(),
	239	+ $handle
	240	+ ),
	241	+ $dependencies
	242	+ );
	243	+ }
	244	+
	245	+
	246	+ /**
	247	+ * @param array $dependencies
	248	+ * @return array
	249	+ */
	250	+ protected function addDefaultBlockScriptDependencies(array $dependencies)
	251	+ {
	252	+ $dependencies += array(
	253	+ 'wp-blocks', // Provides useful functions and components for extending the editor
	254	+ 'wp-i18n', // Provides localization functions
	255	+ 'wp-element', // Provides React.Component
	256	+ 'wp-components', // Provides many prebuilt components and controls
	257	+ CoreAssetManager::JS_HANDLE_EE_COMPONENTS
	258	+ );
	259	+ return $dependencies;
	260	+ }
	261	+
	262	+
	263	+ /**
	264	+ * @return JavascriptAsset\|null
	265	+ */
	266	+ public function getEditorScript()
	267	+ {
	268	+ return $this->assets->getJavascriptAsset($this->editor_script_handle);
	269	+ }
	270	+
	271	+
	272	+ /**
	273	+ * @return StylesheetAsset\|null
	274	+ */
	275	+ public function getEditorStyle()
	276	+ {
	277	+ return $this->assets->getStylesheetAsset($this->editor_style_handle);
	278	+ }
	279	+
	280	+
	281	+ /**
	282	+ * @return JavascriptAsset\|null
	283	+ */
	284	+ public function getScript()
	285	+ {
	286	+ return $this->assets->getJavascriptAsset($this->script_handle);
	287	+ }
	288	+
	289	+
	290	+ /**
	291	+ * @return StylesheetAsset\|null
	292	+ */
	293	+ public function getStyle()
	294	+ {
	295	+ return $this->assets->getStylesheetAsset($this->style_handle);
	296	+ }
	297	+
	298	+
	299	+ /**
	300	+ * @return void
	301	+ */
	302	+ public function enqueueAssets()
	303	+ {
	304	+ $assets = array(
	305	+ $this->getEditorScript(),
	306	+ $this->getEditorStyle(),
	307	+ $this->getScript(),
	308	+ $this->getStyle(),
	309	+ );
	310	+ foreach ($assets as $asset) {
	311	+ if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
	312	+ $asset->enqueueAsset();
	313	+ }
	314	+ }
	315	+ }
316	316
317	317	}

		@@ -14,20 +14,20 @@
		block discarded – undo
14	14	*/
15	15	class CoreBlocksAssetManager extends BlockAssetManager
16	16	{
17		- const JS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
18		- const CSS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
19		- const JS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
20		- const CSS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
	17	+ const JS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
	18	+ const CSS_HANDLE_CORE_BLOCKS_EDITOR = 'core-blocks';
	19	+ const JS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
	20	+ const CSS_HANDLE_CORE_BLOCKS = 'core-blocks-frontend';
21	21
22	22
23		- /**
24		- * @since $VID:$
25		- */
26		- public function setAssetHandles()
27		- {
28		- $this->setEditorScriptHandle(self::JS_HANDLE_CORE_BLOCKS_EDITOR);
29		- $this->setEditorStyleHandle(self::CSS_HANDLE_CORE_BLOCKS_EDITOR);
30		- $this->setScriptHandle(self::JS_HANDLE_CORE_BLOCKS);
31		- $this->setStyleHandle(self::CSS_HANDLE_CORE_BLOCKS);
32		- }
	23	+ /**
	24	+ * @since $VID:$
	25	+ */
	26	+ public function setAssetHandles()
	27	+ {
	28	+ $this->setEditorScriptHandle(self::JS_HANDLE_CORE_BLOCKS_EDITOR);
	29	+ $this->setEditorStyleHandle(self::CSS_HANDLE_CORE_BLOCKS_EDITOR);
	30	+ $this->setScriptHandle(self::JS_HANDLE_CORE_BLOCKS);
	31	+ $this->setStyleHandle(self::CSS_HANDLE_CORE_BLOCKS);
	32	+ }
33	33	}

eventespresso / event-espresso-core

Pull Request — Gutenberg/master (#756)

Status

Category

Indentation +291 added lines, -291 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch