Skip to content

Commit 0ddfdb8

Browse files
committed
Merge branch 'release/0.13.2' into master
2 parents 7decaaf + d238e09 commit 0ddfdb8

File tree

5 files changed

+23
-9
lines changed

5 files changed

+23
-9
lines changed

demo/build/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
3838
}
3939
config.$inject = ['$sceDelegateProvider', '$httpProvider', '$stateProvider', '$compileProvider', '$urlRouterProvider', 'demoMapProvider'];
4040

41-
app.constant('version', 'v0.13.1');
41+
app.constant('version', 'v0.13.2');
4242
app.config(config);
4343

4444
angular.element(document).ready(function() {

dist/ngHandsontable.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
2-
* ng-handsontable 0.13.1
2+
* ng-handsontable 0.13.2
33
*
44
* Copyright 2012-2015 Marcin Warpechowski
55
* Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
66
* Licensed under the MIT license.
77
* https://github.com/handsontable/ngHandsontable
8-
* Date: Thu Aug 20 2020 11:07:09 GMT+0200 (CEST)
8+
* Date: Tue Sep 01 2020 09:23:44 GMT+0200 (czas środkowoeuropejski letni)
99
*/
1010

1111
if (document.all && !document.addEventListener) { // IE 8 and lower
@@ -315,7 +315,14 @@ Handsontable.hooks.add('afterContextMenuShow', function() {
315315
* @returns {Array}
316316
*/
317317
getAvailableSettings: function(hyphenateStyle) {
318-
var settings = Object.keys(Handsontable.DefaultSettings.prototype);
318+
var defaultSettings = Handsontable.DefaultSettings.prototype;
319+
320+
// For Handsontable v8 the prototype is `undefined`.
321+
if (defaultSettings === void 0) {
322+
defaultSettings = Handsontable.DefaultSettings;
323+
}
324+
325+
var settings = Object.keys(defaultSettings);
319326

320327
if (settings.indexOf('contextMenuCopyPaste') === -1) {
321328
settings.push('contextMenuCopyPaste');

dist/ngHandsontable.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/handsontable/ngHandsontable/issues"
1111
},
1212
"author": "Handsoncode <hello@handsontable.com>",
13-
"version": "0.13.1",
13+
"version": "0.13.2",
1414
"dependencies": {
1515
"angular": "^1.5.0",
1616
"handsontable": "^0.28.0"

src/services/settingFactory.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,14 @@
214214
* @returns {Array}
215215
*/
216216
getAvailableSettings: function(hyphenateStyle) {
217-
var settings = Object.keys(Handsontable.DefaultSettings.prototype);
217+
var defaultSettings = Handsontable.DefaultSettings.prototype;
218+
219+
// For Handsontable v8 the prototype is `undefined`.
220+
if (defaultSettings === void 0) {
221+
defaultSettings = Handsontable.DefaultSettings;
222+
}
223+
224+
var settings = Object.keys(defaultSettings);
218225

219226
if (settings.indexOf('contextMenuCopyPaste') === -1) {
220227
settings.push('contextMenuCopyPaste');

0 commit comments

Comments
 (0)