Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/optimize
/src/fixtures/vislib/mock_data
/src/ui/public/angular-bootstrap
/src/ui/public/flot-charts
/test/fixtures/scenarios
/src/core_plugins/console/public/webpackShims
/src/core_plugins/console/public/tests/webpackShims
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import _ from 'lodash';
import $ from '../lib/flot';
import $ from 'ui/flot-charts';
import eventBus from '../lib/events';
import Resize from './resize';
import calculateBarWidth from '../lib/calculate_bar_width';
Expand Down
13 changes: 0 additions & 13 deletions src/core_plugins/metrics/public/visualizations/lib/flot.js

This file was deleted.

5 changes: 4 additions & 1 deletion src/core_plugins/tests_bundle/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ export default (kibana) => {
let modules = [];
const config = kibana.config;

const testGlobs = ['src/ui/public/**/*.js'];
const testGlobs = [
'src/ui/public/**/*.js',
'!src/ui/public/flot-charts/**/*',
];
const testingPluginIds = config.get('tests_bundle.pluginId');

if (testingPluginIds) {
Expand Down
File renamed without changes.
13 changes: 13 additions & 0 deletions src/ui/public/flot-charts/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import $ from 'jquery';
if (window) window.jQuery = $;
require('ui/flot-charts/jquery.flot');
require('ui/flot-charts/jquery.flot.time');
require('ui/flot-charts/jquery.flot.canvas');
require('ui/flot-charts/jquery.flot.symbol');
require('ui/flot-charts/jquery.flot.crosshair');
require('ui/flot-charts/jquery.flot.selection');
require('ui/flot-charts/jquery.flot.pie');
require('ui/flot-charts/jquery.flot.stack');
require('ui/flot-charts/jquery.flot.threshold');
require('ui/flot-charts/jquery.flot.fillbetween');
module.exports = $;
1 change: 0 additions & 1 deletion tasks/config/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module.exports = function () {
'!src/es_archiver/**',
'!src/functional_test_runner/**',
'bin/**',
'packages/flot-charts/**',
'ui_framework/components/**',
'ui_framework/services/**',
'ui_framework/dist/**',
Expand Down