Merge branch 'release/1.0.0-beta5'

handsontable · Apr 30, 2018 · d7f23d0 · d7f23d0
2 parents cc5162d + 26127e7
commit d7f23d0
Show file tree

Hide file tree

Showing 20 changed files with 3,448 additions and 4,295 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -8,9 +8,12 @@
 3.
 
 ### Demo
-<!--- Provide a link to a live example on JSFiddle or Codepen -->
+<!--- Provide a link to a live example on Stackblitz -->
+https://stackblitz.com/edit/handsontable-angular
 
 ### Your environment
+* Angular version:
+* Handsontable version:
 * Wrapper version:
 * Browser Name and version:
 * Operating System:
diff --git a/.release.json b/.release.json
@@ -6,14 +6,13 @@
   "release_message": true,
   "remote": "origin",
   "pre_commit_commands": [
-    "npm run test"
+    "npm run test",
+    "npm run pre-release"
   ],
   "post_commit_commands": [],
   "post_complete_commands": [
-    "npm publish"
+    "npm publish dist/ce --access public",
+    "npm publish dist/pro --access public"
   ],
-  "files_to_commit": [
-    "./bundles/**/*",
-    "./dist/**/*"
-  ]
-}
+  "files_to_commit": []
+}
diff --git a/lib/ce/package.json b/lib/ce/package.json
@@ -1,40 +1,6 @@
 {
   "name": "@handsontable/angular",
   "version": "1.0.0-beta4",
-  "description": "Official Angular.io directive for Handsontable",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/handsontable/angular-handsontable.git"
-  },
-  "author": {
-    "name": "Handsoncode",
-    "email": "hello@handsontable.com"
-  },
-  "keywords": [
-    "angular",
-    "angular2",
-    "angular4",
-    "angular5",
-    "ngx",
-    "handsontable",
-    "data",
-    "grid",
-    "table",
-    "editor",
-    "grid-editor",
-    "data-grid",
-    "data-table",
-    "spreadsheet",
-    "excel",
-    "tabular-data",
-    "edit-cell",
-    "editable-table",
-    "data-spreadsheet"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/handsontable/angular-handsontable/issues"
-  },
   "peerDependencies": {
     "handsontable": "0.35.1",
     "zone.js": "^0.8.19"

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/package.json b/lib/pro/package.json
@@ -1,40 +1,6 @@
 {
   "name": "@handsontable-pro/angular",
   "version": "1.0.0-beta4",
-  "description": "Official Angular.io directive for Handsontable",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/handsontable/angular-handsontable.git"
-  },
-  "author": {
-    "name": "Handsoncode",
-    "email": "hello@handsontable.com"
-  },
-  "keywords": [
-    "angular",
-    "angular2",
-    "angular4",
-    "angular5",
-    "ngx",
-    "handsontable",
-    "data",
-    "grid",
-    "table",
-    "editor",
-    "grid-editor",
-    "data-grid",
-    "data-table",
-    "spreadsheet",
-    "excel",
-    "tabular-data",
-    "edit-cell",
-    "editable-table",
-    "data-spreadsheet"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/handsontable/angular-handsontable/issues"
-  },
   "peerDependencies": {
     "handsontable-pro": "1.15.1",
     "zone.js": "^0.8.19"

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] });
           });
         };
       }