Commit 2d98c662 authored by Nia Kathoni's avatar Nia Kathoni Committed by Daniel Cothran
Browse files

Issue #3267238 by nikathone: Replace JQuery with vanilla Javascript in charts

parent d13ccc3c

modules/charts_billboard/charts_billboard.libraries.yml

+0 −1
Changes for modules/charts_billboard/charts_billboard.libraries.yml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ charts_billboard: 
  dependencies:

    - charts/global

    - core/drupal

    - core/jquery

    - core/once

d3:

  remote: 'https://cdnjs.cloudflare.com/ajax/libs/d3/4.9.1/d3.js'

modules/charts_billboard/js/charts_billboard.js

+6 −5
Changes for modules/charts_billboard/js/charts_billboard.js: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -2,15 +2,16 @@ 
 * @file

 * JavaScript integration between Billboard and Drupal.

 */

(function ($, Drupal, once) {

(function (Drupal, once) {



  'use strict';



  Drupal.behaviors.chartsBillboard = {

    attach: function (context, settings) {

      var contents = new Drupal.Charts.Contents();

      const contents = new Drupal.Charts.Contents();

      once('charts-billboard', '.charts-billboard', context).forEach(function (element) {

        var id = element['attributes']['id']['value'];

        bb.generate(contents.getData(id));

        bb.generate(contents.getData(element.id));

      });

    }

  };

}(jQuery, Drupal, once));
 
}(Drupal, once));

modules/charts_c3/charts_c3.libraries.yml

+0 −1
Changes for modules/charts_c3/charts_c3.libraries.yml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ charts_c3: 
  dependencies:

    - charts/global

    - core/drupal

    - core/jquery

    - core/once

d3:

  remote: 'https://d3js.org/d3.v3.min.js'

modules/charts_c3/js/charts_c3.js

+7 −6
Changes for modules/charts_c3/js/charts_c3.js: 7 added lines, 6 removed lines.
Original line number Diff line number Diff line 
/**

 * @file

 * JavaScript integration between C3 and Drupal.

 * JavaScript's integration between C3 and Drupal.

 */

(function ($, Drupal, once) {

(function (Drupal, once) {



  'use strict';



  Drupal.behaviors.chartsC3 = {

    attach: function (context, settings) {

      var contents = new Drupal.Charts.Contents();

      const contents = new Drupal.Charts.Contents();

      once('charts-c3', '.charts-c3', context).forEach(function (element) {

        var id = element['attributes']['id']['value'];

        c3.generate(contents.getData(id));

        c3.generate(contents.getData(element.id));

      });

    }

  };

}(jQuery, Drupal, once));
 
}(Drupal, once));

modules/charts_chartjs/charts_chartjs.libraries.yml

+0 −1
Changes for modules/charts_chartjs/charts_chartjs.libraries.yml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ charts_chartjs: 
    /libraries/chartjs-adapter-date-fns/dist/chartjs-adapter-date-fns.bundle.js: { }

  dependencies:

    - core/drupal

    - core/jquery

    - core/once

chartjs:

  version: 1.x