From 1ed4f64e6017a29d1f876e214fc5447f8722495e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 2 Mar 2016 08:44:20 +0100 Subject: [PATCH] templating(): minor update to regex escape chars, #2918 --- public/app/features/templating/templateSrv.js | 2 +- public/sass/utils/_validation.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js index 534fd927140..3527c386220 100644 --- a/public/app/features/templating/templateSrv.js +++ b/public/app/features/templating/templateSrv.js @@ -35,7 +35,7 @@ function (angular, _) { }; function regexEscape(value) { - return value.replace(/[-[\]{}()*+!<=:?.\/\\^$|#\s,]/g, '\\$&'); + return value.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'); } function luceneEscape(value) { diff --git a/public/sass/utils/_validation.scss b/public/sass/utils/_validation.scss index b732322d2de..b59b65f6a54 100644 --- a/public/sass/utils/_validation.scss +++ b/public/sass/utils/_validation.scss @@ -2,6 +2,6 @@ input[type=text].ng-dirty.ng-invalid { box-shadow: inset 0 0px 7px $red; } -form input.ng-invalid { +input.ng-dirty.ng-invalid { color: $errorText; }