Skip to content
Snippets Groups Projects
Commit e2c208ac authored by andileco's avatar andileco
Browse files

incorporate patch from 2864456 and remove unused reference to a theme file

parent 0d3873f1
No related branches found
No related tags found
No related merge requests found
...@@ -218,7 +218,7 @@ function charts_cast_element_integer_values(&$element) { ...@@ -218,7 +218,7 @@ function charts_cast_element_integer_values(&$element) {
function charts_settings_form($form, $defaults = array(), $field_options = array(), $parents = array()) { function charts_settings_form($form, $defaults = array(), $field_options = array(), $parents = array()) {
// Ensure all defaults are set. // Ensure all defaults are set.
$options = array_merge(charts_default_settings(), $defaults); $options = array_merge(charts_default_settings(), $defaults);
$form['#attached']['library'][] = array('charts', 'charts.admin'); $form['#attached']['library'][] = "charts/charts.admin";
// Get a list of available chart libraries. // Get a list of available chart libraries.
$charts_info = charts_info(); $charts_info = charts_info();
......
...@@ -6,7 +6,6 @@ use Drupal\core\form\FormStateInterface; ...@@ -6,7 +6,6 @@ use Drupal\core\form\FormStateInterface;
use Drupal\Core\Render\Element; use Drupal\Core\Render\Element;
use Drupal\views\Plugin\views\style\StylePluginBase; use Drupal\views\Plugin\views\style\StylePluginBase;
\Drupal::moduleHandler()->loadInclude('charts', 'inc', 'charts.theme');
\Drupal::moduleHandler()->loadInclude('charts', 'inc', 'includes/charts.pages'); \Drupal::moduleHandler()->loadInclude('charts', 'inc', 'includes/charts.pages');
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment