fix(core/directives/directive_provider): fix regexp to allow more att…

…ributes within @HostListener (#78)
ngParty · May 6, 2016 · 92bd0a3 · 92bd0a3
1 parent dc68889
commit 92bd0a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/core/directives/directive_provider.ts b/src/core/directives/directive_provider.ts
@@ -328,7 +328,7 @@ export class DirectiveProvider {
       const cbString = hostListener[ eventKey ];
       // here we parse out callback method and its argument to separate strings
       // - for instance we got from 'onMove($event.target)' --> 'onMove','$event.target'
-      const [,cbMethodName,cbMethodArgs] = /^(\w+)\(([$\w.,]*)\)$/.exec( cbString );
+      const [,cbMethodName,cbMethodArgs] = /^(\w+)\(([$\w.\s,]*)\)$/.exec( cbString );
       const eventValue = [
         cbMethodName,
         // filter out empty values and trim values

diff --git a/test/core/directives/directive_provider.spec.ts b/test/core/directives/directive_provider.spec.ts
@@ -686,6 +686,8 @@ describe( `directives/directive_provider`, ()=> {
           '[attr.aria-label]': 'ariaLabel',
           '[readonly]': 'isReadonly',
           '(mousemove)': 'onMove($event.target)',
+          '(mouseenter)': 'onMouseEnter($event.clientX,$event.clientY)',
+          '(mouseleave)': 'onMouseLeave($event.clientX, $event.clientY)',
           '(mouseout)': 'onMoveOut()',
           '(document: click)': 'onDocumentClick()',
           '(window    : resize)': 'onWindowResize()',
@@ -711,6 +713,8 @@ describe( `directives/directive_provider`, ()=> {
           },
           hostListeners: {
             'mousemove': [ 'onMove', '$event.target' ],
+            'mouseenter': [ 'onMouseEnter', '$event.clientX', '$event.clientY' ],
+            'mouseleave': [ 'onMouseLeave', '$event.clientX', '$event.clientY' ],
             'mouseout': [ 'onMoveOut' ],
             'document:click': [ 'onDocumentClick' ],
             'window:resize': [ 'onWindowResize' ],