IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved timepicker to components

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-01-23 11:55:52 +01:00
parent 2356057f20
commit ec37f84727
6 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/dashboard/timepicker/timepicker.ts → public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
View File

@ -159,7 +159,7 @@ export class TimePickerCtrl {
export function settingsDirective() {
return {
restrict: 'E',
templateUrl: 'public/app/features/dashboard/timepicker/settings.html',
templateUrl: 'public/app/features/dashboard/components/TimePicker/settings.html',
controller: TimePickerCtrl,
bindToController: true,
controllerAs: 'ctrl',
@ -172,7 +172,7 @@ export function settingsDirective() {
export function timePickerDirective() {
return {
restrict: 'E',
templateUrl: 'public/app/features/dashboard/timepicker/timepicker.html',
templateUrl: 'public/app/features/dashboard/components/TimePicker/template.html',
controller: TimePickerCtrl,
bindToController: true,
controllerAs: 'ctrl',
@ -185,5 +185,5 @@ export function timePickerDirective() {
angular.module('grafana.directives').directive('gfTimePickerSettings', settingsDirective);
angular.module('grafana.directives').directive('gfTimePicker', timePickerDirective);
import { inputDateDirective } from './input_date';
import { inputDateDirective } from './validation';
angular.module('grafana.directives').directive('inputDatetime', inputDateDirective);

1
public/app/features/dashboard/components/TimePicker/index.ts Normal file
View File

@ -0,0 +1 @@
export { TimePickerCtrl } from './TimePickerCtrl';

0
public/app/features/dashboard/timepicker/settings.html → public/app/features/dashboard/components/TimePicker/settings.html
View File

0
public/app/features/dashboard/timepicker/timepicker.html → public/app/features/dashboard/components/TimePicker/template.html
View File

0
public/app/features/dashboard/timepicker/input_date.ts → public/app/features/dashboard/components/TimePicker/validation.ts
View File

2
public/app/features/dashboard/index.ts
View File

@ -12,7 +12,6 @@ import './validation_srv';
import './time_srv';
import './unsaved_changes_srv';
import './unsaved_changes_modal';
import './timepicker/timepicker';
import './upload';
import './ad_hoc_filters';
import './repeat_option/repeat_option';
@ -27,6 +26,7 @@ import './components/FolderPicker';
import './components/VersionHistory';
import './components/DashboardSettings';
import './components/SubMenu';
import './components/TimePicker';
import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
// angular wrappers