Skip to content

Commit

Permalink
Merge pull request #58 from vegarringdal/master
Browse files Browse the repository at this point in the history
fix for #57
  • Loading branch information
vegarringdal authored Oct 6, 2016
2 parents 2a813a0 + ac6cd3f commit 0775ecf
Show file tree
Hide file tree
Showing 25 changed files with 131 additions and 62 deletions.
19 changes: 18 additions & 1 deletion dist/amd/aurelia-v-grid.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
globalResources: any;
}
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
export function configure(config: any): any;

/*export function configure(config) {
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'
);
}
*/
/*****************************************************************************************************************
* ContextMenu
* This is where I create all the <v-grid> attributes, and set then to vGridConfig
Expand Down
12 changes: 1 addition & 11 deletions dist/amd/vGrid/plugin.js
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
define(['exports'], function (exports) {
'use strict';

Object.defineProperty(exports, "__esModule", {
value: true
});
exports.configure = configure;
function configure(config) {
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');
}
});
define([], function () {});
2 changes: 1 addition & 1 deletion dist/amd/vGrid/v-grid-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ define(["exports"], function (exports) {
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;
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
};

function _classCallCheck(instance, Constructor) {
Expand Down
2 changes: 1 addition & 1 deletion dist/amd/vGrid/v-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ define(['exports', 'aurelia-framework', './v-grid-generator', './v-grid-filter',
}

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

var event = new CustomEvent(name, {
detail: data,
Expand Down
19 changes: 18 additions & 1 deletion dist/aurelia-v-grid.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
globalResources: any;
}
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
export function configure(config: any): any;

/*export function configure(config) {
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'
);
}
*/
/*****************************************************************************************************************
* ContextMenu
* This is where I create all the <v-grid> attributes, and set then to vGridConfig
Expand Down
4 changes: 2 additions & 2 deletions dist/aurelia-v-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function configure(aurelia: Aurelia, configCallback?: (builder: ConfigBui
aurelia.globalResources(builder.globalResources);
}

export function configure(config) {
/*export function configure(config) {
config.globalResources(
'vGrid/v-grid-element-footer-pager',
'vGrid/v-grid-element-row-repeat',
Expand All @@ -50,7 +50,7 @@ export function configure(config) {
'vGrid/v-grid-attributes-resize-col'
);
}

*/
/*****************************************************************************************************************
* ContextMenu
* This is where I create all the <v-grid> attributes, and set then to vGridConfig
Expand Down
19 changes: 18 additions & 1 deletion dist/commonjs/aurelia-v-grid.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
globalResources: any;
}
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
export function configure(config: any): any;

/*export function configure(config) {
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'
);
}
*/
/*****************************************************************************************************************
* ContextMenu
* This is where I create all the <v-grid> attributes, and set then to vGridConfig
Expand Down
10 changes: 1 addition & 9 deletions dist/commonjs/vGrid/plugin.js
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
'use strict';

Object.defineProperty(exports, "__esModule", {
value: true
});
exports.configure = configure;
function configure(config) {
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');
}
"use strict";
2 changes: 1 addition & 1 deletion dist/commonjs/vGrid/v-grid-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

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

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

Expand Down
2 changes: 1 addition & 1 deletion dist/commonjs/vGrid/v-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ var VGrid = exports.VGrid = (_dec = (0, _aureliaFramework.bindable)({ attribute:
}

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

var event = new CustomEvent(name, {
detail: data,
Expand Down
19 changes: 18 additions & 1 deletion dist/dev/aurelia-v-grid.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
globalResources: any;
}
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
export function configure(config: any): any;

/*export function configure(config) {
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'
);
}
*/
/*****************************************************************************************************************
* ContextMenu
* This is where I create all the <v-grid> attributes, and set then to vGridConfig
Expand Down
2 changes: 1 addition & 1 deletion dist/dev/dist/dev/vGrid/plugin.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/dev/dist/dev/vGrid/v-grid.js.map

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions dist/dev/vGrid/plugin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/dev/vGrid/v-grid-filter.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/dev/vGrid/v-grid.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion dist/es6/aurelia-v-grid.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
globalResources: any;
}
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
export function configure(config: any): any;

/*export function configure(config) {
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'
);
}
*/
/*****************************************************************************************************************
* ContextMenu
* This is where I create all the <v-grid> attributes, and set then to vGridConfig
Expand Down
3 changes: 2 additions & 1 deletion dist/es6/vGrid/plugin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export function configure(config) {
/*export function configure(config) {
config.globalResources(
'vGrid/v-grid-element-footer-pager',
'vGrid/v-grid-element-row-repeat',
Expand All @@ -15,3 +15,4 @@ export function configure(config) {
'vGrid/v-grid-attributes-resize-col'
);
}
*/
19 changes: 18 additions & 1 deletion dist/system/aurelia-v-grid.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,25 @@ declare module 'aurelia-v-grid' {
globalResources: any;
}
export function configure(aurelia: Aurelia, configCallback?: ((builder: ConfigBuilder) => void)): any;
export function configure(config: any): any;

/*export function configure(config) {
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'
);
}
*/
/*****************************************************************************************************************
* ContextMenu
* This is where I create all the <v-grid> attributes, and set then to vGridConfig
Expand Down
8 changes: 1 addition & 7 deletions dist/system/vGrid/plugin.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
'use strict';
"use strict";

System.register([], function (_export, _context) {
"use strict";

function configure(config) {
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');
}

_export('configure', configure);

return {
setters: [],
execute: function () {}
Expand Down
2 changes: 1 addition & 1 deletion dist/system/vGrid/v-grid-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ System.register([], function (_export, _context) {
_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;
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
};

_export("VGridFilter", VGridFilter = function () {
Expand Down
2 changes: 1 addition & 1 deletion dist/system/vGrid/v-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ System.register(['aurelia-framework', './v-grid-generator', './v-grid-filter', '
}

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

var event = new CustomEvent(name, {
detail: data,
Expand Down
9 changes: 2 additions & 7 deletions dist/temp/aurelia-v-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
exports.__esModule = true;
exports.VGrid = exports.VGridSort = exports.VGridSelection = exports.VGridScrollEvents = exports.VGridObservables = exports.VGridMarkupGenerator = exports.VGridGenerator = exports.VGridFilter = exports.VGridElementRowRepeat = exports.VGridElementFooterPager = exports.VGridElementColConfig = exports.VGridCtx = exports.Contextmenu = exports.VGridConfig = exports.vGridAttributesSort = exports.vGridAttributesSelection = exports.vGridAttributesResizeCol = exports.vGridAttributesObserveField = exports.vGridAttributesKeyMove = exports.vGridAttributesImageFix = exports.vGridAttributesFilter = exports.vGridDragDropCol = exports.ContextRowMenu = exports.VGridHeaderMenu = exports.ConfigBuilder = undefined;

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

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

var _dec, _dec2, _class2, _dec3, _dec4, _class4, _dec5, _dec6, _class6, _dec7, _dec8, _class7, _dec9, _dec10, _class8, _dec11, _dec12, _class9, _dec13, _dec14, _class10, _dec15, _dec16, _class11, _dec17, _dec18, _class12, _dec19, _dec20, _class13, _dec21, _dec22, _dec23, _dec24, _dec25, _dec26, _dec27, _dec28, _dec29, _dec30, _dec31, _dec32, _dec33, _dec34, _class15, _desc, _value, _class16, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _dec35, _dec36, _class18, _dec37, _dec38, _dec39, _dec40, _class20, _dec41, _dec42, _dec43, _dec44, _dec45, _dec46, _dec47, _dec48, _dec49, _dec50, _dec51, _dec52, _dec53, _dec54, _dec55, _dec56, _dec57, _dec58, _desc2, _value2, _class25, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21, _descriptor22, _descriptor23, _descriptor24, _descriptor25, _descriptor26, _descriptor27, _descriptor28, _descriptor29, _class26, _temp3;

exports.configure = configure;
exports.configure = configure;

var _aureliaFramework = require('aurelia-framework');
Expand Down Expand Up @@ -79,10 +78,6 @@ function configure(aurelia, configCallback) {
aurelia.globalResources(builder.globalResources);
}

function configure(config) {
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');
}

var VGridHeaderMenu = exports.VGridHeaderMenu = (_dec = (0, _aureliaFramework.customAttribute)('v-header-menu'), _dec2 = (0, _aureliaFramework.inject)(Element, VGrid), _dec(_class2 = _dec2(_class2 = function (_Contextmenu) {
_inherits(VGridHeaderMenu, _Contextmenu);

Expand Down Expand Up @@ -4443,7 +4438,7 @@ var VGrid = exports.VGrid = (_dec41 = (0, _aureliaFramework.bindable)({ attribut
}

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

var event = new CustomEvent(name, {
detail: data,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-v-grid",
"version": "0.2.5",
"version": "0.2.6",
"registry": "github",
"description": "Simple data grid for Aurelia",
"keywords": [
Expand Down
Loading

0 comments on commit 0775ecf

Please sign in to comment.