Merge pull request #45 from bitecodes/fix-chips-and-select-callbacks

Bind callback functions for chips and select by using statement

Author: kamilkisiela

src/types/chips/chips.js

@@ -21,13 +21,13 @@ export default (formlyConfigProvider) => {
           attribute: 'delete-hint'
         },
         onAdd: {
-          bound: 'md-on-add'
+          statement: 'md-on-add'
         },
         onRemove: {
-          bound: 'md-on-remove'
+          statement: 'md-on-remove'
         },
         onSelect: {
-          bound: 'md-on-select'
+          statement: 'md-on-select'
         }
       }
     },

src/types/select/select.js

@@ -15,10 +15,10 @@ export default (formlyConfigProvider) => {
           bound: 'ng-disabled'
         },
         onClose: {
-          bound: 'md-on-close'
+          statement: 'md-on-close'
         },
         onOpen: {
-          bound: 'md-on-open'
+          statement: 'md-on-open'
         }
       }
     },

tests/types/chips-spec.js

@@ -13,15 +13,15 @@ describe('formlyMaterial - chips type', () => {
   let fieldScope;
   const theme = 'custom';
 
-  function onAdd() {
+  function onAdd($modelValue, $inputValue, scope, $event) {
     return true;
   }
 
-  function onRemove() {
+  function onRemove($modelValue, $inputValue, scope, $event) {
     return true;
   }
 
-  function onSelect() {
+  function onSelect($modelValue, $inputValue, scope, $event) {
     return true;
   }
   //
@@ -95,17 +95,17 @@ describe('formlyMaterial - chips type', () => {
   });
 
   it('should have onAdd callback', () => {
-    expect(element.attr('md-on-add')).toBe(`options.templateOptions['onAdd']`);
+    expect(element.attr('md-on-add')).toBe(`options.templateOptions['onAdd'](model[options.key], options, this, $event)`);
     expect(fieldScope.options.templateOptions.onAdd).toBe(onAdd);
   });
 
   it('should have onRemove callback', () => {
-    expect(element.attr('md-on-remove')).toBe(`options.templateOptions['onRemove']`);
+    expect(element.attr('md-on-remove')).toBe(`options.templateOptions['onRemove'](model[options.key], options, this, $event)`);
     expect(fieldScope.options.templateOptions.onRemove).toBe(onRemove);
   });
 
   it('should have onSelect callback', () => {
-    expect(element.attr('md-on-select')).toBe(`options.templateOptions['onSelect']`);
+    expect(element.attr('md-on-select')).toBe(`options.templateOptions['onSelect'](model[options.key], options, this, $event)`);
     expect(fieldScope.options.templateOptions.onSelect).toBe(onSelect);
   });
 

tests/types/select-spec.js

@@ -17,6 +17,13 @@ describe('formlyMaterial - select type', () => {
   let field;
   const theme = 'custom';
 
+  function onClose($modelValue, $inputValue, scope, $event) {
+    return true;
+  }
+
+  function onOpen($modelValue, $inputValue, scope, $event) {
+    return true;
+  }
   //
   // helpers
   //
@@ -30,8 +37,8 @@ describe('formlyMaterial - select type', () => {
         theme,
         label: 'test field',
         multiple: true,
-        onClose: () => true,
-        onOpen: () => true,
+        onClose: onClose,
+        onOpen: onOpen,
         options: [{
           name: 'first',
           nameUp: 'FIRST',
@@ -119,12 +126,14 @@ describe('formlyMaterial - select type', () => {
 
   it('should be able to bind md-on-close', () => {
     compile();
-    expect(element.attr('md-on-close')).toBe(`options.templateOptions['onClose']`);
+    expect(element.attr('md-on-close')).toBe(`options.templateOptions['onClose'](model[options.key], options, this, $event)`);
+    expect(elementScope.options.templateOptions.onClose).toBe(onClose);
   });
 
   it('should be able to bind md-on-open', () => {
     compile();
-    expect(element.attr('md-on-open')).toBe(`options.templateOptions['onOpen']`);
+    expect(element.attr('md-on-open')).toBe(`options.templateOptions['onOpen'](model[options.key], options, this, $event)`);
+    expect(elementScope.options.templateOptions.onOpen).toBe(onOpen);
   });
 
   it('should be able to be disabled', () => {