From 2ce9d4571c80fddb784d0a42b9404ba5228c295f Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 16 May 2016 14:29:54 +0200 Subject: [PATCH] fix(alerting): fix spacing --- public/app/core/services/alert_srv.ts | 2 ++ public/app/features/alerts/partials/alerts_page.html | 7 +++---- public/app/partials/confirm_modal.html | 3 +-- public/sass/components/_modals.scss | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts index c54a4bab269..149b44feca8 100644 --- a/public/app/core/services/alert_srv.ts +++ b/public/app/core/services/alert_srv.ts @@ -78,12 +78,14 @@ export class AlertSrv { scope.text2 = payload.text2; scope.confirmText = payload.confirmText; scope.confirmTextRequired = payload.confirmText !== ""; + scope.onConfirm = function() { if (!scope.confirmTextRequired || (scope.confirmTextRequired && scope.confirmTextValid)) { payload.onConfirm(); scope.dismiss(); } }; + scope.updateConfirmText = function(value) { scope.confirmInput = value; scope.confirmTextValid = scope.confirmText === scope.confirmInput; diff --git a/public/app/features/alerts/partials/alerts_page.html b/public/app/features/alerts/partials/alerts_page.html index 21d91b6637c..3b866540c05 100644 --- a/public/app/features/alerts/partials/alerts_page.html +++ b/public/app/features/alerts/partials/alerts_page.html @@ -20,17 +20,17 @@ - + {{alert.title}} - + - + edit @@ -39,4 +39,3 @@ - diff --git a/public/app/partials/confirm_modal.html b/public/app/partials/confirm_modal.html index 5e249e55c3d..24a09fb1a26 100644 --- a/public/app/partials/confirm_modal.html +++ b/public/app/partials/confirm_modal.html @@ -23,7 +23,7 @@ @@ -34,4 +34,3 @@ - diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss index 5f93b4e0592..fe728e5b39e 100644 --- a/public/sass/components/_modals.scss +++ b/public/sass/components/_modals.scss @@ -173,4 +173,3 @@ text-overflow: ellipsis; } } -