Skip to content

Commit

Permalink
Rename directives to be easier to find.
Browse files Browse the repository at this point in the history
  • Loading branch information
cjcenizal committed May 23, 2017
1 parent b875a3b commit edd607d
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/core_plugins/timelion/public/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { notify } from 'ui/notify';

require('plugins/timelion/directives/cells/cells');
require('plugins/timelion/directives/fullscreen/fullscreen');
require('plugins/timelion/directives/interval/interval');
require('plugins/timelion/directives/expression_directive');
require('plugins/timelion/directives/timelion_interval/timelion_interval');
require('plugins/timelion/directives/timelion_expression_input');
require('plugins/timelion/directives/fixed_element');
require('plugins/timelion/directives/docs');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ import $ from 'jquery';
import grammar from 'raw!../chain.peg';
import PEG from 'pegjs';

import './partials/suggestion';
import timelionExpressionInputTemplate from './expression_directive.html';
import './timelion_expression_suggestions/timelion_expression_suggestions';
import timelionExpressionInputTemplate from './timelion_expression_input.html';
import {
FunctionSuggestions,
suggest,
insertAtLocation,
} from './expression_directive_helpers';
} from './timelion_expression_input_helpers';

const Parser = PEG.buildParser(grammar);
const app = require('ui/modules').get('apps/timelion', []);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import timelionExpressionSuggestionsTemplate from './suggestion.html';
import template from './timelion_expression_suggestions.html';

const app = require('ui/modules').get('apps/timelion', []);

Expand All @@ -12,7 +12,7 @@ app.directive('timelionExpressionSuggestions', () => {
shouldPopover: '=',
},
replace: true,
template: timelionExpressionSuggestionsTemplate,
template,
link: function (scope) {
// This will prevent the expression input from losing focus.
scope.onMouseDown = e => e.preventDefault();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import _ from 'lodash';
import $ from 'jquery';
import './interval.less';

const app = require('ui/modules').get('apps/timelion', []);
import html from './interval.html';
import template from './timelion_interval.html';
import './timelion_interval.less';

app.directive('timelionInterval', function ($compile, $timeout) {
return {
Expand All @@ -15,7 +15,7 @@ app.directive('timelionInterval', function ($compile, $timeout) {
// Timelion app or in the sidebar in the Visualize app.
inHeader: '=',
},
template: html,
template,
link: function ($scope, $elem) {
$scope.intervalOptions = ['auto', '1s', '1m', '1h', '1d', '1w', '1M', '1y', 'other'];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';

define(function (require) {
require('plugins/timelion/directives/chart/chart');
require('plugins/timelion/directives/interval/interval');
require('plugins/timelion/directives/timelion_interval/timelion_interval');
require('ui/state_management/app_state');

const _ = require('lodash');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define(function (require) {
require('plugins/timelion/directives/expression_directive');
require('plugins/timelion/directives/timelion_expression_input');

const module = require('ui/modules').get('kibana/timelion_vis', ['kibana']);
module.controller('TimelionVisParamsController', function ($scope, $rootScope) {
Expand Down

0 comments on commit edd607d

Please sign in to comment.