Changed: context in hooks #55. Bump @angular/* (#79)

handsontable · Apr 25, 2018 · 2662156 · 2662156
1 parent 9a7f7f1
commit 2662156
Show file tree

Hide file tree

Showing 14 changed files with 6,372 additions and 1,735 deletions.
diff --git a/lib/ce/src/hot-settings-resolver.service.ts b/lib/ce/src/hot-settings-resolver.service.ts
@@ -58,9 +58,10 @@ export class HotSettingsResolver {
         if (this.hooks.indexOf(key) > -1) {
           mergedSettings[key] = (p1, p2, p3, p4, p5, p6) => {
             return component._ngZone.run(() => {
-              return component['settings'][key](p1, p2, p3, p4, p5, p6);
+              return component['settings'][key].call(component.hotInstance, p1, p2, p3, p4, p5, p6);
             })
           };
+
         } else {
           mergedSettings[key] = component['settings'][key];
         }
@@ -79,9 +80,9 @@ export class HotSettingsResolver {
       const hook = component[key];
 
       if (hook && hook.observers.length > 0) {
-        mergedSettings[key] = (p1,  p2,  p3,  p4,  p5,  p6) => {
+        mergedSettings[key] = (p1, p2, p3, p4, p5, p6) => {
           component._ngZone.run(() => {
-            component[key].emit({ hotInstance: component.hotInstance, params: [p1,  p2,  p3,  p4,  p5,  p6] });
+            component[key].emit({ hotInstance: component.hotInstance, params: [p1, p2, p3, p4, p5, p6] });
           });
         };
       }

diff --git a/lib/pro/src/hot-settings-resolver.service.ts b/lib/pro/src/hot-settings-resolver.service.ts
@@ -88,9 +88,10 @@ export class HotSettingsResolver {
         if (this.hooks.indexOf(key) > -1) {
           mergedSettings[key] = (p1, p2, p3, p4, p5, p6) => {
             return component._ngZone.run(() => {
-              return component['settings'][key](p1, p2, p3, p4, p5, p6);
+              return component['settings'][key].call(component.hotInstance, p1, p2, p3, p4, p5, p6);
             })
           };
+
         } else {
           mergedSettings[key] = component['settings'][key];
         }
@@ -109,9 +110,9 @@ export class HotSettingsResolver {
       const hook = component[key];
 
       if (hook && hook.observers.length > 0) {
-        mergedSettings[key] = (p1,  p2,  p3,  p4,  p5,  p6) => {
+        mergedSettings[key] = (p1, p2, p3, p4, p5, p6) => {
           component._ngZone.run(() => {
-            component[key].emit({ hotInstance: component.hotInstance, params: [p1,  p2,  p3,  p4,  p5,  p6] });
+            component[key].emit({ hotInstance: component.hotInstance, params: [p1, p2, p3, p4, p5, p6] });
           });
         };
       }