Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 4b3c2c6

Browse files
Ghislain BeaulacGhislain Beaulac
Ghislain Beaulac
authored and
Ghislain Beaulac
committed
prepare release 0.9.2
1 parent 0062ac1 commit 4b3c2c6

11 files changed

+38
-17
lines changed

dist/angular-slickgrid.es5.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9775,7 +9775,7 @@ var translateFormatter = function (row, cell, value, columnDef, dataContext) {
97759775
if (!params.i18n || !(params.i18n instanceof TranslateService)) {
97769776
throw new Error("The translate formatter requires the ngx-translate \"TranslateService\" to be provided as a column params.\n For example: this.columnDefinitions = [{ id: title, field: title, formatter: Formatters.translate, params: { i18n: this.translateService }");
97779777
}
9778-
return params.i18n.instant(value);
9778+
return params.i18n.instant(value || ' ');
97799779
};
97809780
var yesNoFormatter = function (row, cell, value, columnDef, dataContext) { return value ? 'Yes' : 'No'; };
97819781
// import { Group, GroupTotals } from '../core'
@@ -10045,7 +10045,7 @@ var FilterService = /** @class */ (function () {
1004510045
this.subscriber = new Slick.Event();
1004610046
this.emitFilterChangedBy('local');
1004710047
dataView.setFilterArgs({ columnFilters: this._columnFilters, grid: this._grid });
10048-
dataView.setFilter(this.customFilter);
10048+
dataView.setFilter(this.customFilter.bind(this, dataView));
1004910049
this.subscriber.subscribe(function (e, args) {
1005010050
var /** @type {?} */ columnId = args.columnId;
1005110051
if (columnId != null) {
@@ -10057,11 +10057,12 @@ var FilterService = /** @class */ (function () {
1005710057
});
1005810058
};
1005910059
/**
10060+
* @param {?} dataView
1006010061
* @param {?} item
1006110062
* @param {?} args
1006210063
* @return {?}
1006310064
*/
10064-
FilterService.prototype.customFilter = function (item, args) {
10065+
FilterService.prototype.customFilter = function (dataView, item, args) {
1006510066
for (var _g = 0, _h = Object.keys(args.columnFilters); _g < _h.length; _g++) {
1006610067
var columnId = _h[_g];
1006710068
var /** @type {?} */ columnFilter = args.columnFilters[columnId];
@@ -10084,6 +10085,12 @@ var FilterService = /** @class */ (function () {
1008410085
if (searchTerm === '') {
1008510086
return true;
1008610087
}
10088+
// when using localization (i18n), we should use the formatter output to search as the new cell value
10089+
if (columnDef && columnDef.params && columnDef.params.useFormatterOuputToFilter) {
10090+
var /** @type {?} */ rowIndex = (dataView && typeof dataView.getIdxById === 'function') ? dataView.getIdxById(item.id) : 0;
10091+
cellValue = columnDef.formatter(rowIndex, columnIndex, cellValue, columnDef, item);
10092+
}
10093+
// make sure cell value is always a string
1008710094
if (typeof cellValue === 'number') {
1008810095
cellValue = cellValue.toString();
1008910096
}

dist/angular-slickgrid.es5.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-slickgrid.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11581,7 +11581,7 @@ const translateFormatter = (row, cell, value, columnDef, dataContext) => {
1158111581
throw new Error(`The translate formatter requires the ngx-translate "TranslateService" to be provided as a column params.
1158211582
For example: this.columnDefinitions = [{ id: title, field: title, formatter: Formatters.translate, params: { i18n: this.translateService }`);
1158311583
}
11584-
return params.i18n.instant(value);
11584+
return params.i18n.instant(value || ' ');
1158511585
};
1158611586

1158711587
const yesNoFormatter = (row, cell, value, columnDef, dataContext) => value ? 'Yes' : 'No';
@@ -11841,7 +11841,7 @@ class FilterService {
1184111841
this.subscriber = new Slick.Event();
1184211842
this.emitFilterChangedBy('local');
1184311843
dataView.setFilterArgs({ columnFilters: this._columnFilters, grid: this._grid });
11844-
dataView.setFilter(this.customFilter);
11844+
dataView.setFilter(this.customFilter.bind(this, dataView));
1184511845
this.subscriber.subscribe((e, args) => {
1184611846
const /** @type {?} */ columnId = args.columnId;
1184711847
if (columnId != null) {
@@ -11853,11 +11853,12 @@ class FilterService {
1185311853
});
1185411854
}
1185511855
/**
11856+
* @param {?} dataView
1185611857
* @param {?} item
1185711858
* @param {?} args
1185811859
* @return {?}
1185911860
*/
11860-
customFilter(item, args) {
11861+
customFilter(dataView, item, args) {
1186111862
for (const /** @type {?} */ columnId of Object.keys(args.columnFilters)) {
1186211863
const /** @type {?} */ columnFilter = args.columnFilters[columnId];
1186311864
const /** @type {?} */ columnIndex = args.grid.getColumnIndex(columnId);
@@ -11879,6 +11880,12 @@ class FilterService {
1187911880
if (searchTerm === '') {
1188011881
return true;
1188111882
}
11883+
// when using localization (i18n), we should use the formatter output to search as the new cell value
11884+
if (columnDef && columnDef.params && columnDef.params.useFormatterOuputToFilter) {
11885+
const /** @type {?} */ rowIndex = (dataView && typeof dataView.getIdxById === 'function') ? dataView.getIdxById(item.id) : 0;
11886+
cellValue = columnDef.formatter(rowIndex, columnIndex, cellValue, columnDef, item);
11887+
}
11888+
// make sure cell value is always a string
1188211889
if (typeof cellValue === 'number') {
1188311890
cellValue = cellValue.toString();
1188411891
}

dist/angular-slickgrid.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/bundles/angular-slickgrid.umd.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9774,7 +9774,7 @@ var translateFormatter = function (row, cell, value, columnDef, dataContext) {
97749774
if (!params.i18n || !(params.i18n instanceof core.TranslateService)) {
97759775
throw new Error("The translate formatter requires the ngx-translate \"TranslateService\" to be provided as a column params.\n For example: this.columnDefinitions = [{ id: title, field: title, formatter: Formatters.translate, params: { i18n: this.translateService }");
97769776
}
9777-
return params.i18n.instant(value);
9777+
return params.i18n.instant(value || ' ');
97789778
};
97799779
var yesNoFormatter = function (row, cell, value, columnDef, dataContext) { return value ? 'Yes' : 'No'; };
97809780
// import { Group, GroupTotals } from '../core'
@@ -10044,7 +10044,7 @@ var FilterService = /** @class */ (function () {
1004410044
this.subscriber = new Slick.Event();
1004510045
this.emitFilterChangedBy('local');
1004610046
dataView.setFilterArgs({ columnFilters: this._columnFilters, grid: this._grid });
10047-
dataView.setFilter(this.customFilter);
10047+
dataView.setFilter(this.customFilter.bind(this, dataView));
1004810048
this.subscriber.subscribe(function (e, args) {
1004910049
var /** @type {?} */ columnId = args.columnId;
1005010050
if (columnId != null) {
@@ -10056,11 +10056,12 @@ var FilterService = /** @class */ (function () {
1005610056
});
1005710057
};
1005810058
/**
10059+
* @param {?} dataView
1005910060
* @param {?} item
1006010061
* @param {?} args
1006110062
* @return {?}
1006210063
*/
10063-
FilterService.prototype.customFilter = function (item, args) {
10064+
FilterService.prototype.customFilter = function (dataView, item, args) {
1006410065
for (var _g = 0, _h = Object.keys(args.columnFilters); _g < _h.length; _g++) {
1006510066
var columnId = _h[_g];
1006610067
var /** @type {?} */ columnFilter = args.columnFilters[columnId];
@@ -10083,6 +10084,12 @@ var FilterService = /** @class */ (function () {
1008310084
if (searchTerm === '') {
1008410085
return true;
1008510086
}
10087+
// when using localization (i18n), we should use the formatter output to search as the new cell value
10088+
if (columnDef && columnDef.params && columnDef.params.useFormatterOuputToFilter) {
10089+
var /** @type {?} */ rowIndex = (dataView && typeof dataView.getIdxById === 'function') ? dataView.getIdxById(item.id) : 0;
10090+
cellValue = columnDef.formatter(rowIndex, columnIndex, cellValue, columnDef, item);
10091+
}
10092+
// make sure cell value is always a string
1008610093
if (typeof cellValue === 'number') {
1008710094
cellValue = cellValue.toString();
1008810095
}

dist/bundles/angular-slickgrid.umd.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/bundles/angular-slickgrid.umd.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/bundles/angular-slickgrid.umd.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"name":"angular-slickgrid","version":"0.9.1","description":"Slickgrid components made available in Angular","keywords":["angular","plugin","datatable","slickgrid"],"license":"MIT","scripts":{"ng":"ng","start":"ng serve","build":"ng build","test":"ng test","lint":"ng lint","e2e":"ng e2e","build-lib":"npm-run-all packagr sass:build sass:copy copy:i18n","build-lib-pack":"npm-run-all build-lib pack-lib copy-pack del-pack","copy:i18n":"cross-env copyfiles -f src/assets/i18n/*.json dist/i18n","copy-pack":"cross-env copyfiles -f *.tgz ../Angular-Slickgrid-PackageTest","del-pack":"cross-env del *.tgz","pack-lib":"npm pack ./dist","packagr":"ng-packagr -p ng-package.json","sass-build-task:scss-compile":"node-sass --source-map true src/app/modules/angular-slickgrid/styles/ -o dist/styles/css","sass-build-task:autoprefixer":"postcss dist/styles/css/*.css --use autoprefixer -d dist/styles/css","sass:build":"npm-run-all -p sass-build-task:*","sass:copy":"cross-env copyfiles -f src/app/modules/angular-slickgrid/styles/*.scss dist/styles/sass","sass:watch":"node-sass 'src/app/modules/angular-slickgrid/styles/**/*.scss' -c 'npm run sass:build'"},"author":"Ghislain B.","repository":{"type":"git","url":"http://github.com/ghiscoding/angular-slickgrid"},"private":false,"dependencies":{"@ngx-translate/core":"^9.1.1","@ngx-translate/http-loader":"^2.0.0","bootstrap":"^3.3.7","core-js":"^2.5.1","flatpickr":"^4.0.6","font-awesome":"^4.7.0","jquery":"^3.2.1","lodash":"^4.17.4","moment-mini":"^2.18.1","slickgrid":"^2.3.12","vinyl-paths":"^2.1.0"},"devDependencies":{"@angular/animations":"^5.0.0","@angular/cli":"1.5.4","@angular/common":"^5.0.0","@angular/compiler":"^5.0.0","@angular/compiler-cli":"^5.0.0","@angular/core":"^5.0.0","@angular/forms":"^5.0.0","@angular/http":"^5.0.0","@angular/language-service":"^5.0.0","@angular/platform-browser":"^5.0.0","@angular/platform-browser-dynamic":"^5.0.0","@angular/router":"^5.0.0","@types/flatpickr":"^3.1.2","@types/jasmine":"~2.6.0","@types/jasminewd2":"~2.0.3","@types/moment":"^2.13.0","@types/node":"^8.0.39","codelyzer":"~3.2.0","copyfiles":"^1.2.0","cross-env":"^5.1.0","del":"^3.0.0","del-cli":"^1.1.0","gulp":"^3.9.1","gulp-bump":"^2.7.0","gulp-sass":"^3.1.0","gulp-yuidoc":"^0.1.2","jasmine-core":"~2.8.0","jasmine-spec-reporter":"~4.2.1","karma":"~1.7.1","karma-chrome-launcher":"~2.2.0","karma-cli":"~1.0.1","karma-coverage-istanbul-reporter":"^1.3.0","karma-jasmine":"~1.1.0","karma-jasmine-html-reporter":"^0.2.2","ng-packagr":"^1.6.0","node-sass":"^4.5.3","npm-run-all":"^4.1.1","postcss-cli":"^4.1.1","protractor":"~5.1.2","require-dir":"^0.3.2","run-sequence":"^2.2.0","rxjs":"^5.4.2","ts-node":"~3.3.0","tslint":"^5.8.0","typescript":"^2.3.4","yargs":"^9.0.1","zone.js":"^0.8.17"},"main":"bundles/angular-slickgrid.umd.js","module":"angular-slickgrid.es5.js","es2015":"angular-slickgrid.js","typings":"angular-slickgrid.d.ts","metadata":"angular-slickgrid.metadata.json"}
1+
{"name":"angular-slickgrid","version":"0.9.2","description":"Slickgrid components made available in Angular","keywords":["angular","plugin","datatable","slickgrid"],"license":"MIT","scripts":{"ng":"ng","start":"ng serve","build":"ng build","test":"ng test","lint":"ng lint","e2e":"ng e2e","build-lib":"npm-run-all packagr sass:build sass:copy copy:i18n","build-lib-pack":"npm-run-all build-lib pack-lib copy-pack del-pack","copy:i18n":"cross-env copyfiles -f src/assets/i18n/*.json dist/i18n","copy-pack":"cross-env copyfiles -f *.tgz ../Angular-Slickgrid-PackageTest","del-pack":"cross-env del *.tgz","pack-lib":"npm pack ./dist","packagr":"ng-packagr -p ng-package.json","sass-build-task:scss-compile":"node-sass --source-map true src/app/modules/angular-slickgrid/styles/ -o dist/styles/css","sass-build-task:autoprefixer":"postcss dist/styles/css/*.css --use autoprefixer -d dist/styles/css","sass:build":"npm-run-all -p sass-build-task:*","sass:copy":"cross-env copyfiles -f src/app/modules/angular-slickgrid/styles/*.scss dist/styles/sass","sass:watch":"node-sass 'src/app/modules/angular-slickgrid/styles/**/*.scss' -c 'npm run sass:build'"},"author":"Ghislain B.","repository":{"type":"git","url":"http://github.com/ghiscoding/angular-slickgrid"},"private":false,"dependencies":{"@ngx-translate/core":"^9.1.1","@ngx-translate/http-loader":"^2.0.0","bootstrap":"^3.3.7","core-js":"^2.5.1","flatpickr":"^4.0.6","font-awesome":"^4.7.0","jquery":"^3.2.1","lodash":"^4.17.4","moment-mini":"^2.18.1","slickgrid":"^2.3.12","vinyl-paths":"^2.1.0"},"devDependencies":{"@angular/animations":"^5.0.0","@angular/cli":"1.5.4","@angular/common":"^5.0.0","@angular/compiler":"^5.0.0","@angular/compiler-cli":"^5.0.0","@angular/core":"^5.0.0","@angular/forms":"^5.0.0","@angular/http":"^5.0.0","@angular/language-service":"^5.0.0","@angular/platform-browser":"^5.0.0","@angular/platform-browser-dynamic":"^5.0.0","@angular/router":"^5.0.0","@types/flatpickr":"^3.1.2","@types/jasmine":"~2.6.0","@types/jasminewd2":"~2.0.3","@types/moment":"^2.13.0","@types/node":"^8.0.39","codelyzer":"~3.2.0","copyfiles":"^1.2.0","cross-env":"^5.1.0","del":"^3.0.0","del-cli":"^1.1.0","gulp":"^3.9.1","gulp-bump":"^2.7.0","gulp-sass":"^3.1.0","gulp-yuidoc":"^0.1.2","jasmine-core":"~2.8.0","jasmine-spec-reporter":"~4.2.1","karma":"~1.7.1","karma-chrome-launcher":"~2.2.0","karma-cli":"~1.0.1","karma-coverage-istanbul-reporter":"^1.3.0","karma-jasmine":"~1.1.0","karma-jasmine-html-reporter":"^0.2.2","ng-packagr":"^1.6.0","node-sass":"^4.5.3","npm-run-all":"^4.1.1","postcss-cli":"^4.1.1","protractor":"~5.1.2","require-dir":"^0.3.2","run-sequence":"^2.2.0","rxjs":"^5.4.2","ts-node":"~3.3.0","tslint":"^5.8.0","typescript":"^2.3.4","yargs":"^9.0.1","zone.js":"^0.8.17"},"main":"bundles/angular-slickgrid.umd.js","module":"angular-slickgrid.es5.js","es2015":"angular-slickgrid.js","typings":"angular-slickgrid.d.ts","metadata":"angular-slickgrid.metadata.json"}

dist/src/app/modules/angular-slickgrid/services/filter.service.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export declare class FilterService {
3030
* @param dataView
3131
*/
3232
attachLocalOnFilter(grid: any, options: GridOption, dataView: any): void;
33-
customFilter(item: any, args: any): boolean;
33+
customFilter(dataView: any, item: any, args: any): boolean;
3434
destroy(): void;
3535
/**
3636
* Destroy the filters, since it's a singleton, we don't want to affect other grids with same columns

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-slickgrid",
3-
"version": "0.9.1",
3+
"version": "0.9.2",
44
"description": "Slickgrid components made available in Angular",
55
"keywords": [
66
"angular",

0 commit comments

Comments
 (0)