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

created closeDropdown function, renamed appevent, added second appevent for open timepicker

Browse Source
This commit is contained in:
Patrick O'Carroll 2018-04-04 16:20:01 +02:00
parent 98e1404fed
commit 0273365df3
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/core/services/keybindingSrv.ts
View File

@ -23,13 +23,8 @@ export class KeybindingSrv {
this.setupGlobal(); this.setupGlobal();
appEvents.on('show-modal', () => (this.modalOpen = true)); appEvents.on('show-modal', () => (this.modalOpen = true));
$rootScope.onAppEvent('escTimepicker', () => { $rootScope.onAppEvent('timepickerOpen', () => (this.timepickerOpen = true));
if (!this.timepickerOpen) { $rootScope.onAppEvent('timepickerClosed', () => (this.timepickerOpen = false));
this.timepickerOpen = true;
} else {
this.timepickerOpen = false;
}
});
} }
setupGlobal() { setupGlobal() {

16
public/app/features/dashboard/timepicker/timepicker.ts
View File

@ -22,7 +22,6 @@ export class TimePickerCtrl {
refresh: any; refresh: any;
isUtc: boolean; isUtc: boolean;
firstDayOfWeek: number; firstDayOfWeek: number;
closeDropdown: any;
isOpen: boolean; isOpen: boolean;
/** @ngInject */ /** @ngInject */
@ -96,9 +95,8 @@ export class TimePickerCtrl {
} }
openDropdown() { openDropdown() {
this.$rootScope.appEvent('escTimepicker');
if (this.isOpen) { if (this.isOpen) {
this.isOpen = false; this.closeDropdown();
return; return;
} }
@ -114,16 +112,21 @@ export class TimePickerCtrl {
this.refresh.options.unshift({ text: 'off' }); this.refresh.options.unshift({ text: 'off' });
this.isOpen = true; this.isOpen = true;
this.$rootScope.appEvent('timepickerOpen');
}
closeDropdown() {
this.isOpen = false;
this.$rootScope.appEvent('timepickerClosed');
} }
applyCustom() { applyCustom() {
this.$rootScope.appEvent('escTimepicker');
if (this.refresh.value !== this.dashboard.refresh) { if (this.refresh.value !== this.dashboard.refresh) {
this.timeSrv.setAutoRefresh(this.refresh.value); this.timeSrv.setAutoRefresh(this.refresh.value);
} }
this.timeSrv.setTime(this.editTimeRaw); this.timeSrv.setTime(this.editTimeRaw);
this.isOpen = false; this.closeDropdown();
} }
absoluteFromChanged() { absoluteFromChanged() {
@ -139,7 +142,6 @@ export class TimePickerCtrl {
} }
setRelativeFilter(timespan) { setRelativeFilter(timespan) {
this.$rootScope.appEvent('escTimepicker');
var range = { from: timespan.from, to: timespan.to }; var range = { from: timespan.from, to: timespan.to };
if (this.panel.nowDelay && range.to === 'now') { if (this.panel.nowDelay && range.to === 'now') {
@ -147,7 +149,7 @@ export class TimePickerCtrl {
} }
this.timeSrv.setTime(range); this.timeSrv.setTime(range);
this.isOpen = false; this.closeDropdown();
} }
} }