Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2404253 by wuinfo, mermentau: Undefined index: css in color_library_info_alter()

8.0.x
Alex Pott 2015-07-30 15:47:45 +01:00
parent 6366f77221
commit 6c2eb9c1ba
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/modules/color/color.module
View File

@ -76,25 +76,27 @@ function color_library_info_alter(&$libraries, $extension) {
$color_paths = \Drupal::config('color.theme.' . $extension)->get('stylesheets');
if (!empty($color_paths)) {
foreach (array_keys($libraries) as $name) {
// Override stylesheets.
foreach ($libraries[$name]['css'] as $category => $css_assets) {
foreach ($css_assets as $path => $metadata) {
// Loop over the path array with recolored CSS files to find matching
// paths which could replace the non-recolored paths.
foreach ($color_paths as $color_path) {
// Color module currently requires unique file names to be used,
// which allows us to compare different file paths.
if (drupal_basename($path) == drupal_basename($color_path)) {
// Replace the path to the new css file.
// This keeps the order of the stylesheets intact.
$index = array_search($path, array_keys($libraries[$name]['css'][$category]));
$preceding_css_assets = array_slice($libraries[$name]['css'][$category], 0, $index);
$succeeding_css_assets = array_slice($libraries[$name]['css'][$category], $index + 1);
$libraries[$name]['css'][$category] = array_merge(
$preceding_css_assets,
[$color_path => $metadata],
$succeeding_css_assets
);
if(isset($libraries[$name]['css'])) {
// Override stylesheets.
foreach ($libraries[$name]['css'] as $category => $css_assets) {
foreach ($css_assets as $path => $metadata) {
// Loop over the path array with recolored CSS files to find matching
// paths which could replace the non-recolored paths.
foreach ($color_paths as $color_path) {
// Color module currently requires unique file names to be used,
// which allows us to compare different file paths.
if (drupal_basename($path) == drupal_basename($color_path)) {
// Replace the path to the new css file.
// This keeps the order of the stylesheets intact.
$index = array_search($path, array_keys($libraries[$name]['css'][$category]));
$preceding_css_assets = array_slice($libraries[$name]['css'][$category], 0, $index);
$succeeding_css_assets = array_slice($libraries[$name]['css'][$category], $index + 1);
$libraries[$name]['css'][$category] = array_merge(
$preceding_css_assets,
[$color_path => $metadata],
$succeeding_css_assets
);
}
}
}
}

7
core/modules/color/tests/modules/color_test/themes/color_test_theme/color_test_theme.libraries.yml
View File

@ -3,3 +3,10 @@ base:
css:
theme:
css/colors.css: {}
fontsizer:
version: VERSION
js:
js/color_test_theme-fontsize.js: {}
dependencies:
- core/jquery

9
core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js Normal file
View File

@ -0,0 +1,9 @@
/**
* @file
* Adds javascript functions for font resizing.
*/
(function ($) {
"use strict";
$(document).ready(function () {});
})(jQuery);