Skip to content

Commit 0775ecf

Browse files
authored
Merge pull request #58 from vegarringdal/master
fix for #57
2 parents 2a813a0 + ac6cd3f commit 0775ecf

25 files changed

+131
-62
lines changed

dist/amd/aurelia-v-grid.d.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
2424
globalResources: any;
2525
}
2626
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
27-
export function configure(config: any): any;
2827

28+
/*export function configure(config) {
29+
config.globalResources(
30+
'vGrid/v-grid-element-footer-pager',
31+
'vGrid/v-grid-element-row-repeat',
32+
'vGrid/v-grid-element-col-config',
33+
'vGrid/v-grid',
34+
'vGrid/v-grid-attributes-filter',
35+
'vGrid/v-grid-attributes-sort',
36+
'vGrid/v-grid-attributes-selection',
37+
'vGrid/v-grid-attributes-image',
38+
'vGrid/v-grid-attributes-key-move',
39+
'vGrid/v-grid-attributes-contextmenu',
40+
'vGrid/v-grid-attributes-observe-field',
41+
'vGrid/v-grid-attributes-dragDropCol',
42+
'vGrid/v-grid-attributes-resize-col'
43+
);
44+
}
45+
*/
2946
/*****************************************************************************************************************
3047
* ContextMenu
3148
* This is where I create all the <v-grid> attributes, and set then to vGridConfig

dist/amd/vGrid/plugin.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
define(['exports'], function (exports) {
2-
'use strict';
3-
4-
Object.defineProperty(exports, "__esModule", {
5-
value: true
6-
});
7-
exports.configure = configure;
8-
function configure(config) {
9-
config.globalResources('vGrid/v-grid-element-footer-pager', 'vGrid/v-grid-element-row-repeat', 'vGrid/v-grid-element-col-config', 'vGrid/v-grid', 'vGrid/v-grid-attributes-filter', 'vGrid/v-grid-attributes-sort', 'vGrid/v-grid-attributes-selection', 'vGrid/v-grid-attributes-image', 'vGrid/v-grid-attributes-key-move', 'vGrid/v-grid-attributes-contextmenu', 'vGrid/v-grid-attributes-observe-field', 'vGrid/v-grid-attributes-dragDropCol', 'vGrid/v-grid-attributes-resize-col');
10-
}
11-
});
1+
define([], function () {});

dist/amd/vGrid/v-grid-filter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ define(["exports"], function (exports) {
88
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
99
return typeof obj;
1010
} : function (obj) {
11-
return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
11+
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
1212
};
1313

1414
function _classCallCheck(instance, Constructor) {

dist/amd/vGrid/v-grid.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ define(['exports', 'aurelia-framework', './v-grid-generator', './v-grid-filter',
133133
}
134134

135135
VGrid.prototype.raiseEvent = function raiseEvent(name) {
136-
var data = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
136+
var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
137137

138138
var event = new CustomEvent(name, {
139139
detail: data,

dist/aurelia-v-grid.d.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
2424
globalResources: any;
2525
}
2626
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
27-
export function configure(config: any): any;
2827

28+
/*export function configure(config) {
29+
config.globalResources(
30+
'vGrid/v-grid-element-footer-pager',
31+
'vGrid/v-grid-element-row-repeat',
32+
'vGrid/v-grid-element-col-config',
33+
'vGrid/v-grid',
34+
'vGrid/v-grid-attributes-filter',
35+
'vGrid/v-grid-attributes-sort',
36+
'vGrid/v-grid-attributes-selection',
37+
'vGrid/v-grid-attributes-image',
38+
'vGrid/v-grid-attributes-key-move',
39+
'vGrid/v-grid-attributes-contextmenu',
40+
'vGrid/v-grid-attributes-observe-field',
41+
'vGrid/v-grid-attributes-dragDropCol',
42+
'vGrid/v-grid-attributes-resize-col'
43+
);
44+
}
45+
*/
2946
/*****************************************************************************************************************
3047
* ContextMenu
3148
* This is where I create all the <v-grid> attributes, and set then to vGridConfig

dist/aurelia-v-grid.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export function configure(aurelia: Aurelia, configCallback?: (builder: ConfigBui
3333
aurelia.globalResources(builder.globalResources);
3434
}
3535

36-
export function configure(config) {
36+
/*export function configure(config) {
3737
config.globalResources(
3838
'vGrid/v-grid-element-footer-pager',
3939
'vGrid/v-grid-element-row-repeat',
@@ -50,7 +50,7 @@ export function configure(config) {
5050
'vGrid/v-grid-attributes-resize-col'
5151
);
5252
}
53-
53+
*/
5454
/*****************************************************************************************************************
5555
* ContextMenu
5656
* This is where I create all the <v-grid> attributes, and set then to vGridConfig

dist/commonjs/aurelia-v-grid.d.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
2424
globalResources: any;
2525
}
2626
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
27-
export function configure(config: any): any;
2827

28+
/*export function configure(config) {
29+
config.globalResources(
30+
'vGrid/v-grid-element-footer-pager',
31+
'vGrid/v-grid-element-row-repeat',
32+
'vGrid/v-grid-element-col-config',
33+
'vGrid/v-grid',
34+
'vGrid/v-grid-attributes-filter',
35+
'vGrid/v-grid-attributes-sort',
36+
'vGrid/v-grid-attributes-selection',
37+
'vGrid/v-grid-attributes-image',
38+
'vGrid/v-grid-attributes-key-move',
39+
'vGrid/v-grid-attributes-contextmenu',
40+
'vGrid/v-grid-attributes-observe-field',
41+
'vGrid/v-grid-attributes-dragDropCol',
42+
'vGrid/v-grid-attributes-resize-col'
43+
);
44+
}
45+
*/
2946
/*****************************************************************************************************************
3047
* ContextMenu
3148
* This is where I create all the <v-grid> attributes, and set then to vGridConfig

dist/commonjs/vGrid/plugin.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
'use strict';
2-
3-
Object.defineProperty(exports, "__esModule", {
4-
value: true
5-
});
6-
exports.configure = configure;
7-
function configure(config) {
8-
config.globalResources('vGrid/v-grid-element-footer-pager', 'vGrid/v-grid-element-row-repeat', 'vGrid/v-grid-element-col-config', 'vGrid/v-grid', 'vGrid/v-grid-attributes-filter', 'vGrid/v-grid-attributes-sort', 'vGrid/v-grid-attributes-selection', 'vGrid/v-grid-attributes-image', 'vGrid/v-grid-attributes-key-move', 'vGrid/v-grid-attributes-contextmenu', 'vGrid/v-grid-attributes-observe-field', 'vGrid/v-grid-attributes-dragDropCol', 'vGrid/v-grid-attributes-resize-col');
9-
}
1+
"use strict";

dist/commonjs/vGrid/v-grid-filter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66

7-
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
7+
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
88

99
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
1010

dist/commonjs/vGrid/v-grid.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var VGrid = exports.VGrid = (_dec = (0, _aureliaFramework.bindable)({ attribute:
148148
}
149149

150150
VGrid.prototype.raiseEvent = function raiseEvent(name) {
151-
var data = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
151+
var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
152152

153153
var event = new CustomEvent(name, {
154154
detail: data,

0 commit comments

Comments
 (0)