From 6f1a6d5a567bc818cfec3b9b24a246afc3bd2d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 24 Sep 2014 16:26:39 +0200 Subject: [PATCH] Changed name of emitAppEvent to just appEvent --- src/app/controllers/dashboardCtrl.js | 4 ++-- src/app/controllers/dashboardNavCtrl.js | 12 ++++++------ src/app/controllers/grafanaCtrl.js | 2 +- src/app/controllers/search.js | 4 ++-- src/app/directives/dashEditLink.js | 2 +- src/app/panels/timepicker/module.js | 2 +- src/app/services/alertSrv.js | 2 +- src/app/services/dashboard/dashboardKeyBindings.js | 8 ++++---- src/app/services/panelSrv.js | 6 +++--- src/app/services/timeSrv.js | 2 +- src/test/specs/helpers.js | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/app/controllers/dashboardCtrl.js b/src/app/controllers/dashboardCtrl.js index 709e33ae7d3..dfe97682aa0 100644 --- a/src/app/controllers/dashboardCtrl.js +++ b/src/app/controllers/dashboardCtrl.js @@ -58,7 +58,7 @@ function (angular, $, config, _) { $scope.setWindowTitleAndTheme(); - $scope.emitAppEvent("dashboard-loaded", $scope.dashboard); + $scope.appEvent("dashboard-loaded", $scope.dashboard); }; $scope.setWindowTitleAndTheme = function() { @@ -113,7 +113,7 @@ function (angular, $, config, _) { var editScope = $rootScope.$new(); editScope.object = options.object; editScope.updateHandler = options.updateHandler; - $scope.emitAppEvent('show-dash-editor', { src: 'app/partials/edit_json.html', scope: editScope }); + $scope.appEvent('show-dash-editor', { src: 'app/partials/edit_json.html', scope: editScope }); }; $scope.checkFeatureToggles = function() { diff --git a/src/app/controllers/dashboardNavCtrl.js b/src/app/controllers/dashboardNavCtrl.js index 71a9f756a9c..084d1e215a6 100644 --- a/src/app/controllers/dashboardNavCtrl.js +++ b/src/app/controllers/dashboardNavCtrl.js @@ -69,7 +69,7 @@ function (angular, _, moment, config, store) { }; $scope.openSearch = function() { - $scope.emitAppEvent('show-dash-editor', { src: 'app/partials/search.html' }); + $scope.appEvent('show-dash-editor', { src: 'app/partials/search.html' }); }; $scope.saveDashboard = function() { @@ -88,7 +88,7 @@ function (angular, _, moment, config, store) { $rootScope.$emit('dashboard-saved', $scope.dashboard); }, function(err) { - $scope.emitAppEvent('alert-error', ['Save failed', err]); + $scope.appEvent('alert-error', ['Save failed', err]); }); }; @@ -101,9 +101,9 @@ function (angular, _, moment, config, store) { var id = options.id; $scope.db.deleteDashboard(id).then(function(id) { - alertSrv.set('Dashboard Deleted', id + ' has been deleted', 'success', 5000); - }, function() { - alertSrv.set('Dashboard Not Deleted', 'An error occurred deleting the dashboard', 'error', 5000); + $scope.appEvent('alert-success', ['Dashboard Deleted', id + ' has been deleted']); + }, function(err) { + $scope.appEvent('alert-error', ['Deleted failed', err]); }); }; @@ -138,7 +138,7 @@ function (angular, _, moment, config, store) { }; $scope.editJson = function() { - $scope.emitAppEvent('show-json-editor', { object: $scope.dashboard }); + $scope.appEvent('show-json-editor', { object: $scope.dashboard }); }; $scope.openSaveDropdown = function() { diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js index 98f2115680f..3a420c37d3f 100644 --- a/src/app/controllers/grafanaCtrl.js +++ b/src/app/controllers/grafanaCtrl.js @@ -41,7 +41,7 @@ function (angular, config, _, $, store) { this.$on('$destroy', unbind); }; - $rootScope.emitAppEvent = function(name, payload) { + $rootScope.appEvent = function(name, payload) { $rootScope.$emit(name, payload); }; diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js index 676e39aceb5..5946cf15ee7 100644 --- a/src/app/controllers/search.js +++ b/src/app/controllers/search.js @@ -29,7 +29,7 @@ function (angular, _, config, $) { $scope.keyDown = function (evt) { if (evt.keyCode === 27) { - $scope.emitAppEvent('hide-dash-editor'); + $scope.appEvent('hide-dash-editor'); } if (evt.keyCode === 40) { $scope.moveSelection(1); @@ -121,7 +121,7 @@ function (angular, _, config, $) { $scope.deleteDashboard = function(dash, evt) { evt.stopPropagation(); - $scope.emitAppEvent('delete-dashboard', { id: dash.id, title: dash.title }); + $scope.appEvent('delete-dashboard', { id: dash.id, title: dash.title }); $scope.results.dashboards = _.without($scope.results.dashboards, dash); }; diff --git a/src/app/directives/dashEditLink.js b/src/app/directives/dashEditLink.js index d0babd967e4..b0ac97d3423 100644 --- a/src/app/directives/dashEditLink.js +++ b/src/app/directives/dashEditLink.js @@ -16,7 +16,7 @@ function (angular, $) { elem.bind('click',function() { $timeout(function() { var editorScope = attrs.editorScope === 'isolated' ? null : scope; - scope.emitAppEvent('show-dash-editor', { src: partial, scope: editorScope }); + scope.appEvent('show-dash-editor', { src: partial, scope: editorScope }); }); }); } diff --git a/src/app/panels/timepicker/module.js b/src/app/panels/timepicker/module.js index 656af0898a0..c04a1910bf4 100644 --- a/src/app/panels/timepicker/module.js +++ b/src/app/panels/timepicker/module.js @@ -79,7 +79,7 @@ function (angular, app, _, moment, kbn) { $scope.temptime.to.date = moment($scope.temptime.to.date).add('days',1).toDate(); } - $scope.emitAppEvent('show-dash-editor', {src: 'app/panels/timepicker/custom.html', scope: $scope }); + $scope.appEvent('show-dash-editor', {src: 'app/panels/timepicker/custom.html', scope: $scope }); }; // Constantly validate the input of the fields. This function does not change any date variables diff --git a/src/app/services/alertSrv.js b/src/app/services/alertSrv.js index 2a752569be2..f41e490f374 100644 --- a/src/app/services/alertSrv.js +++ b/src/app/services/alertSrv.js @@ -18,7 +18,7 @@ function (angular, _) { self.set(alert[0], alert[1], 'warning', 5000); }); $rootScope.onAppEvent('alert-success', function(e, alert) { - self.set(alert[0], alert[0], 'success', 3000); + self.set(alert[0], alert[1], 'success', 3000); }); }; diff --git a/src/app/services/dashboard/dashboardKeyBindings.js b/src/app/services/dashboard/dashboardKeyBindings.js index ba8dcaf0f23..11d5e2d4787 100644 --- a/src/app/services/dashboard/dashboardKeyBindings.js +++ b/src/app/services/dashboard/dashboardKeyBindings.js @@ -22,7 +22,7 @@ function(angular, $) { }); keyboardManager.bind('ctrl+f', function() { - scope.emitAppEvent('show-dash-editor', { src: 'app/partials/search.html' }); + scope.appEvent('show-dash-editor', { src: 'app/partials/search.html' }); }, { inputDisabled: true }); keyboardManager.bind('ctrl+h', function() { @@ -31,7 +31,7 @@ function(angular, $) { }, { inputDisabled: true }); keyboardManager.bind('ctrl+s', function(evt) { - scope.emitAppEvent('save-dashboard', evt); + scope.appEvent('save-dashboard', evt); }, { inputDisabled: true }); keyboardManager.bind('ctrl+r', function() { @@ -39,7 +39,7 @@ function(angular, $) { }, { inputDisabled: true }); keyboardManager.bind('ctrl+z', function(evt) { - scope.emitAppEvent('zoom-out', evt); + scope.appEvent('zoom-out', evt); }, { inputDisabled: true }); keyboardManager.bind('esc', function() { @@ -53,7 +53,7 @@ function(angular, $) { modalData.$scope.dismiss(); } - scope.emitAppEvent('hide-dash-editor'); + scope.appEvent('hide-dash-editor'); scope.exitFullscreen(); }, { inputDisabled: true }); diff --git a/src/app/services/panelSrv.js b/src/app/services/panelSrv.js index 5bc877415f3..4563f3ad6c8 100644 --- a/src/app/services/panelSrv.js +++ b/src/app/services/panelSrv.js @@ -52,19 +52,19 @@ function (angular, _) { $scope.toggleFullscreen(true); } else { - $scope.emitAppEvent('show-dash-editor', { src: 'app/partials/paneleditor.html', scope: $scope }); + $scope.appEvent('show-dash-editor', { src: 'app/partials/paneleditor.html', scope: $scope }); } }; $scope.sharePanel = function() { - $scope.emitAppEvent('show-modal', { + $scope.appEvent('show-modal', { src: './app/partials/share-panel.html', scope: $scope.$new() }); }; $scope.editPanelJson = function() { - $scope.emitAppEvent('show-json-editor', { object: $scope.panel, updateHandler: $scope.replacePanel }); + $scope.appEvent('show-json-editor', { object: $scope.panel, updateHandler: $scope.replacePanel }); }; $scope.updateColumnSpan = function(span) { diff --git a/src/app/services/timeSrv.js b/src/app/services/timeSrv.js index 1ee9ecdf925..5a28532eb5a 100644 --- a/src/app/services/timeSrv.js +++ b/src/app/services/timeSrv.js @@ -91,7 +91,7 @@ define([ this.old_refresh = null; } - $rootScope.emitAppEvent('time-range-changed', this.time); + $rootScope.appEvent('time-range-changed', this.time); $timeout(this.refreshDashboard, 0); }; diff --git a/src/test/specs/helpers.js b/src/test/specs/helpers.js index 81f0df7be7e..040905375b7 100644 --- a/src/test/specs/helpers.js +++ b/src/test/specs/helpers.js @@ -68,7 +68,7 @@ define([ self.$httpBackend = $httpBackend; self.$rootScope.onAppEvent = function() {}; - self.$rootScope.emitAppEvent = function() {}; + self.$rootScope.appEvent = function() {}; self.service = $injector.get(name); });