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

Issue #2385111 by tadityar, Wim Leers: Bartik's CKEditor iframe stylesheet is not being loaded, hence image captions look broken

8.0.x
Alex Pott 2014-12-10 12:28:02 +01:00
parent 6c466692d2
commit 68baffe7a7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/ckeditor/ckeditor.module
View File

@ -91,7 +91,7 @@ function _ckeditor_theme_css($theme = NULL) {
}
}
if (isset($info['base theme'])) {
$css = array_merge(_ckeditor_theme_css($info['base theme'], $css));
$css = array_merge(_ckeditor_theme_css($info['base theme']), $css);
}
}
return $css;

6
core/modules/ckeditor/src/Tests/CKEditorTest.php
View File

@ -262,7 +262,11 @@ class CKEditorTest extends KernelTestBase {
$expected[] = file_create_url('core/modules/ckeditor/tests/modules/ckeditor_test.css');
$this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a hook_ckeditor_css_alter() implementation exists.');
// @todo test coverage for _ckeditor_theme_css(), by including a custom theme in this test with a "ckeditor_stylesheets" entry in its .info file.
// Enable the Bartik theme, which specifies a CKEditor stylesheet.
\Drupal::service('theme_handler')->install(['bartik']);
\Drupal::config('system.theme')->set('default', 'bartik');
$expected[] = file_create_url('core/themes/bartik/css/ckeditor-iframe.css');
$this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a theme providing a CKEditor stylesheet exists.');
}
/**