Skip to content
Snippets Groups Projects
Commit aba3f742 authored by Kevin Hill's avatar Kevin Hill
Browse files

[ci skip] wrapping packages in uniq to filter duplicates

parent fa04c925
No related branches found
No related tags found
No related merge requests found
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Loading
Loading
@@ -7,7 +7,7 @@
* @copyright (c) 2017, KHill Designs
* @license MIT
*/
import _forIn from 'lodash/forIn';
import forIn from 'lodash/forIn';
import Renderable from './Renderable';
 
/**
Loading
Loading
@@ -113,7 +113,7 @@ export default class Chart extends Renderable
_attachEvents() {
let $chart = this;
 
_forIn(this.events, function (callback, event) {
forIn(this.events, function (callback, event) {
let context = window;
let func = callback;
 
Loading
Loading
Loading
Loading
@@ -8,7 +8,8 @@
* @copyright (c) 2017, KHill Designs
* @license http://opensource.org/licenses/MIT MIT
*/
import _forIn from 'lodash/forIn';
import forIn from 'lodash/forIn';
import uniq from 'lodash/uniq';
import EventEmitter from 'events';
import Chart from './Chart';
import Dashboard from './Dashboard';
Loading
Loading
@@ -27,8 +28,7 @@ import {InvalidCallback, RenderableNotFound} from './Errors'
* @property {Array.<string>} _packages
* @property {Array.<Renderable>} _renderables
*/
export default class LavaJs extends EventEmitter
{
export default class LavaJs extends EventEmitter {
constructor(newOptions) {
super();
 
Loading
Loading
@@ -187,7 +187,7 @@ export default class LavaJs extends EventEmitter
 
this.visualization = google.visualization;
 
_forIn(this._renderables, renderable => {
forIn(this._renderables, renderable => {
console.log(`[lava.js] Rendering ${renderable.uuid}`);
 
renderable.render();
Loading
Loading
@@ -232,14 +232,14 @@ export default class LavaJs extends EventEmitter
* @throws InvalidCallback
* @throws RenderableNotFound
*/
get(label, callback) {
get (label, callback) {
if (typeof callback !== 'function') {
throw new InvalidCallback(callback);
}
 
let renderable = this._renderables[label];
 
if (! renderable) {
if (!renderable) {
throw new RenderableNotFound(label);
}
 
Loading
Loading
@@ -352,17 +352,6 @@ export default class LavaJs extends EventEmitter
return true;
}
 
/**
* Aliasing google.visualization.arrayToDataTable to lava.arrayToDataTable
*
* @public
* @param {Array} arr
* @return {google.visualization.DataTable}
*/
arrayToDataTable(arr) {
return this.visualization.arrayToDataTable(arr);
}
/**
* Adds to the list of packages that Google needs to load.
*
Loading
Loading
@@ -446,7 +435,7 @@ export default class LavaJs extends EventEmitter
*/
_googleChartLoader(resolve) {
let config = {
packages: this._packages,
packages: uniq(this._packages),
language: this.options.locale
};
 
Loading
Loading
@@ -469,12 +458,12 @@ export default class LavaJs extends EventEmitter
* @returns {Element}
*/
_addGoogleScriptToHead(resolve) {
let $lava = this;
let $lava = this;
let script = document.createElement('script');
 
script.type = 'text/javascript';
script.async = true;
script.src = this.GOOGLE_LOADER_URL;
script.type = 'text/javascript';
script.async = true;
script.src = this.GOOGLE_LOADER_URL;
script.onload = script.onreadystatechange = function (event) {
event = event || window.event;
 
Loading
Loading
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