[flot-charts] move into ui/public (#14669)

This commit is contained in:
Spencer 2017-10-30 12:43:12 -07:00 committed by GitHub
parent 70cb006838
commit 3e08a7e765
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 19 additions and 16 deletions

View file

@ -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

View file

@ -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';

View file

@ -1,13 +0,0 @@
import $ from 'jquery';
if (window) window.jQuery = $;
require('packages/flot-charts/jquery.flot');
require('packages/flot-charts/jquery.flot.time');
require('packages/flot-charts/jquery.flot.canvas');
require('packages/flot-charts/jquery.flot.symbol');
require('packages/flot-charts/jquery.flot.crosshair');
require('packages/flot-charts/jquery.flot.selection');
require('packages/flot-charts/jquery.flot.pie');
require('packages/flot-charts/jquery.flot.stack');
require('packages/flot-charts/jquery.flot.threshold');
require('packages/flot-charts/jquery.flot.fillbetween');
module.exports = $;

View file

@ -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) {

View file

@ -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 = $;

View file

@ -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/**',