Skip to content
Snippets Groups Projects
Commit 2af570a7 authored by Antonio De Marco's avatar Antonio De Marco
Browse files

Issue #120: Add dependencies support for pattern libraries.

parent 9bdc9f8b
No related branches found
No related tags found
No related merge requests found
......@@ -43,6 +43,8 @@ and list them using the following format:
- pattern_library_two:
js:
js/library_two.js: {}
dependencies:
- core/jquery
Let's break this down:
......
......@@ -36,3 +36,5 @@ media:
js:
js/media1.js: {}
js/media2.js: {}
dependencies:
- core/drupal.tabledrag
......@@ -96,14 +96,14 @@ abstract class PatternBase extends PluginBase implements PatternInterface, Conta
/**
* Process libraries.
*
* @param array $libraries
* Libraries array.
* @param array|string $libraries
* List of dependencies or "dependencies:" root property.
* @param string $base_path
* Pattern base path.
* @param string $parent
* Item parent set in previous recursive iteration, if any.
*/
protected function processLibraries(array &$libraries, $base_path, $parent = '') {
protected function processLibraries(&$libraries, $base_path, $parent = '') {
$parents = ['js', 'base', 'layout', 'component', 'state', 'theme'];
$_libraries = $libraries;
foreach ($_libraries as $name => $values) {
......@@ -113,7 +113,7 @@ abstract class PatternBase extends PluginBase implements PatternInterface, Conta
$libraries[$base_path . DIRECTORY_SEPARATOR . $name] = $values;
unset($libraries[$name]);
}
elseif (!$is_asset) {
elseif (!$is_asset && ($parent != 'dependencies')) {
$this->processLibraries($libraries[$name], $base_path, $name);
}
}
......
......@@ -69,6 +69,7 @@ Feature: Overview
And the response should contain "/ui_patterns_test_theme/templates/patterns/media/css/media2.css"
And the response should contain "/ui_patterns_test_theme/templates/patterns/media/js/media1.js"
And the response should contain "/ui_patterns_test_theme/templates/patterns/media/js/media2.js"
And the response should contain "/misc/tabledrag.js"
Scenario: Patterns overview page will show validation errors after clearing the cache.
Given I am logged in as a user with the "access patterns page" permission
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment