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

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
Conflicts:
	README.md
This commit is contained in:
Torkel Ödegaard 2015-02-21 21:22:09 +01:00
commit 8c977e37a9
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@
- [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax) - [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax)
- [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ',' - [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ','
- [Issue #1359](https://github.com/grafana/grafana/issues/1359). Graph: Fix for all series tooltip showing series with all null values when ``Hide Empty`` option is enabled - [Issue #1359](https://github.com/grafana/grafana/issues/1359). Graph: Fix for all series tooltip showing series with all null values when ``Hide Empty`` option is enabled
- [Issue #1497](https://github.com/grafana/grafana/issues/1497). Dashboard: Fixed memory leak when switching dashboards
**Tech** **Tech**
- [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2 - [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2

8
src/app/features/dashboard/keybindings.js
View File

@ -12,13 +12,7 @@ function(angular, $) {
this.shortcuts = function(scope) { this.shortcuts = function(scope) {
scope.$on('$destroy', function() { scope.$on('$destroy', function() {
keyboardManager.unbind('ctrl+f'); keyboardManager.unbindAll();
keyboardManager.unbind('ctrl+h');
keyboardManager.unbind('ctrl+s');
keyboardManager.unbind('ctrl+r');
keyboardManager.unbind('ctrl+z');
keyboardManager.unbind('ctrl+o');
keyboardManager.unbind('esc');
}); });
var helpModalScope = null; var helpModalScope = null;

12
src/app/services/keyboardManager.js
View File

@ -1,7 +1,8 @@
define([ define([
'angular' 'angular',
'lodash'
], ],
function (angular) { function (angular, _) {
'use strict'; 'use strict';
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
@ -252,6 +253,13 @@ function (angular) {
elt['on' + opt['type']] = fct; elt['on' + opt['type']] = fct;
} }
}; };
keyboardManagerService.unbindAll = function() {
_.each(keyboardManagerService.keyboardEvent, function(value, key) {
keyboardManagerService.unbind(key);
});
};
// Remove the shortcut - just specify the shortcut and I will remove the binding // Remove the shortcut - just specify the shortcut and I will remove the binding
keyboardManagerService.unbind = function (label) { keyboardManagerService.unbind = function (label) {
label = label.toLowerCase(); label = label.toLowerCase();