Merge branch 'release/0.13.2' into master

handsontable · Sep 1, 2020 · 0ddfdb8 · 0ddfdb8
2 parents 7decaaf + d238e09
commit 0ddfdb8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/demo/build/app.js b/demo/build/app.js
@@ -38,7 +38,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
     }
     config.$inject = ['$sceDelegateProvider', '$httpProvider', '$stateProvider', '$compileProvider', '$urlRouterProvider', 'demoMapProvider'];
 
-    app.constant('version', 'v0.13.1');
+    app.constant('version', 'v0.13.2');
     app.config(config);
 
     angular.element(document).ready(function() {

diff --git a/dist/ngHandsontable.js b/dist/ngHandsontable.js
@@ -1,11 +1,11 @@
 /**
- * ng-handsontable 0.13.1
+ * ng-handsontable 0.13.2
  * 
  * Copyright 2012-2015 Marcin Warpechowski
  * Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
  * Licensed under the MIT license.
  * https://github.com/handsontable/ngHandsontable
- * Date: Thu Aug 20 2020 11:07:09 GMT+0200 (CEST)
+ * Date: Tue Sep 01 2020 09:23:44 GMT+0200 (czas środkowoeuropejski letni)
 */
 
 if (document.all && !document.addEventListener) { // IE 8 and lower
@@ -315,7 +315,14 @@ Handsontable.hooks.add('afterContextMenuShow', function() {
        * @returns {Array}
        */
       getAvailableSettings: function(hyphenateStyle) {
-        var settings = Object.keys(Handsontable.DefaultSettings.prototype);
+        var defaultSettings = Handsontable.DefaultSettings.prototype;
+
+        // For Handsontable v8 the prototype is `undefined`.
+        if (defaultSettings === void 0) {
+          defaultSettings = Handsontable.DefaultSettings;
+        }
+
+        var settings = Object.keys(defaultSettings);
 
         if (settings.indexOf('contextMenuCopyPaste') === -1) {
           settings.push('contextMenuCopyPaste');

diff --git a/dist/ngHandsontable.min.js b/dist/ngHandsontable.min.js
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/ngHandsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "dependencies": {
     "angular": "^1.5.0",
     "handsontable": "^0.28.0"

diff --git a/src/services/settingFactory.js b/src/services/settingFactory.js
@@ -214,7 +214,14 @@
        * @returns {Array}
        */
       getAvailableSettings: function(hyphenateStyle) {
-        var settings = Object.keys(Handsontable.DefaultSettings.prototype);
+        var defaultSettings = Handsontable.DefaultSettings.prototype;
+
+        // For Handsontable v8 the prototype is `undefined`.
+        if (defaultSettings === void 0) {
+          defaultSettings = Handsontable.DefaultSettings;
+        }
+
+        var settings = Object.keys(defaultSettings);
 
         if (settings.indexOf('contextMenuCopyPaste') === -1) {
           settings.push('contextMenuCopyPaste');