From 846332d72b0dc234f2dfa0e66bc8e261a750a8f9 Mon Sep 17 00:00:00 2001 From: Agnes Chisholm Date: Tue, 28 Mar 2017 17:32:46 -0400 Subject: [PATCH] Issue #2852540: Make flexslider library and module css optional. Fix library download errors. --- .../flexslider_library_test.install | 4 ++- .../flexslider_library_test.module | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tests/modules/flexslider_library_test/flexslider_library_test.install b/tests/modules/flexslider_library_test/flexslider_library_test.install index 6491e82..d025be8 100644 --- a/tests/modules/flexslider_library_test/flexslider_library_test.install +++ b/tests/modules/flexslider_library_test/flexslider_library_test.install @@ -5,11 +5,13 @@ * Install file for the flexslider library test module. */ +use Drupal\Core\Site\Settings; + /** * Implements hook_install(). */ function flexslider_library_test_install() { - $library_folder = DRUPAL_ROOT . '/libraries'; + $library_folder = Settings::get('file_public_path') . '/libraries'; $flexslider_folder = $library_folder . '/flexslider'; if (file_exists($flexslider_folder)) { return; diff --git a/tests/modules/flexslider_library_test/flexslider_library_test.module b/tests/modules/flexslider_library_test/flexslider_library_test.module index 1cda318..2bf0c13 100644 --- a/tests/modules/flexslider_library_test/flexslider_library_test.module +++ b/tests/modules/flexslider_library_test/flexslider_library_test.module @@ -1,9 +1,35 @@ get('flexslider_debug') ? 'jquery.flexslider.js' : 'jquery.flexslider-min.js'; + $libraries['flexslider']['js'][$library_path_test . '/' . $js] = $libraries['flexslider']['js'][$library_path . '/' . $js]; + unset($libraries['flexslider']['js'][$library_path . '/' . $js]); + + if (!empty($libraries['flexslider']['css']['component'][$library_path . '/flexslider.css'])) { + $libraries['flexslider']['css']['component'][$library_path_test . '/flexslider.css'] = $libraries['flexslider']['css']['component'][$library_path . '/flexslider.css']; + unset($libraries['flexslider']['css']['component'][$library_path . '/flexslider.css']); + } + + } +} + /** * Implements hook_page_attachments_alter(). */