From 3d5c75fe3e76724db05a1531e1e8ae5a8c7a5bb4 Mon Sep 17 00:00:00 2001 From: pmadruga Date: Thu, 10 Mar 2016 13:36:05 +0100 Subject: [PATCH 1/2] refactor(): added component text when asserting directive name --- src/ng/compile.js | 4 ++-- test/ng/compileSpec.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ng/compile.js b/src/ng/compile.js index 18ecce99dc92..142cfe5d3aca 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -928,11 +928,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { function assertValidDirectiveName(name) { var letter = name.charAt(0); if (!letter || letter !== lowercase(letter)) { - throw $compileMinErr('baddir', "Directive name '{0}' is invalid. The first character must be a lowercase letter", name); + throw $compileMinErr('baddir', "Directive/Component name '{0}' is invalid. The first character must be a lowercase letter", name); } if (name !== name.trim()) { throw $compileMinErr('baddir', - "Directive name '{0}' is invalid. The name should not contain leading or trailing whitespaces", + "Directive/Component name '{0}' is invalid. The name should not contain leading or trailing whitespaces", name); } } diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index 999830843ca0..8d2fe4910104 100755 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -207,7 +207,7 @@ describe('$compile', function() { module(function() { expect(function() { directive('BadDirectiveName', function() { }); - }).toThrowMinErr('$compile','baddir', "Directive name 'BadDirectiveName' is invalid. The first character must be a lowercase letter"); + }).toThrowMinErr('$compile','baddir', "Directive/Component name 'BadDirectiveName' is invalid. The first character must be a lowercase letter"); }); inject(function($compile) {}); }); @@ -217,7 +217,7 @@ describe('$compile', function() { expect(function() { directive(name, function() { }); }).toThrowMinErr( - '$compile','baddir', 'Directive name \'' + name + '\' is invalid. ' + + '$compile','baddir', 'Directive/Component name \'' + name + '\' is invalid. ' + "The name should not contain leading or trailing whitespaces"); } assertLeadingOrTrailingWhitespaceInDirectiveName(' leadingWhitespaceDirectiveName'); From 979ea246d85b7844dd898c15b9c5d24abe7fb839 Mon Sep 17 00:00:00 2001 From: pmadruga Date: Fri, 11 Mar 2016 15:57:42 +0100 Subject: [PATCH 2/2] docs(): including components in error page of directives name assertion --- docs/content/error/$compile/baddir.ngdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/content/error/$compile/baddir.ngdoc b/docs/content/error/$compile/baddir.ngdoc index 3aef03d1e91b..69a3ef875874 100644 --- a/docs/content/error/$compile/baddir.ngdoc +++ b/docs/content/error/$compile/baddir.ngdoc @@ -1,8 +1,8 @@ @ngdoc error @name $compile:baddir -@fullName Invalid Directive Name +@fullName Invalid Directive/Component Name @description -This error occurs when the name of a directive is not valid. +This error occurs when the name of a directive or component is not valid. -Directives must start with a lowercase character and must not contain leading or trailing whitespaces. +Directives and Components must start with a lowercase character and must not contain leading or trailing whitespaces.