Comparing version 2.3.3 to 2.3.4
{ | ||
"name": "ag-grid", | ||
"version": "2.3.3", | ||
"version": "2.3.4", | ||
"homepage": "http://www.ag-grid.com/", | ||
@@ -5,0 +5,0 @@ "authors": [ |
@@ -76,2 +76,15 @@ | ||
PersonFilter.prototype.getApi = function() { | ||
var that = this; | ||
return { | ||
getModel: function() { | ||
var model = {value: that.$scope.filterText.value}; | ||
return model; | ||
}, | ||
setModel: function(model) { | ||
that.$scope.filterText = model.value; | ||
} | ||
} | ||
}; | ||
function YearFilter() { | ||
@@ -120,2 +133,14 @@ } | ||
YearFilter.prototype.getApi = function() { | ||
var that = this; | ||
return { | ||
getModel: function() { | ||
var model = {value: that.rbSince2010.checked}; | ||
return model; | ||
}, | ||
setModel: function(model) { | ||
that.rbSince2010.checked = model.value; | ||
} | ||
} | ||
}; | ||
}); |
@@ -185,3 +185,7 @@ var gridsModule = angular.module("agGridApp", ["agGrid"]); | ||
floatCell: true, | ||
filterParams: {cellRenderer: countryCellRenderer, cellHeight: 20, newRowsAction: 'keep'}, | ||
filterParams: { | ||
cellRenderer: countryCellRenderer, | ||
cellHeight: 20, | ||
newRowsAction: 'keep' | ||
}, | ||
icons: { | ||
@@ -188,0 +192,0 @@ sortAscending: '<i class="fa fa-sort-alpha-asc"/>', |
{ | ||
"name": "ag-grid", | ||
"version": "2.3.3", | ||
"description": "Advanced Javascript Datagrid. Supports raw Javascript, AngularJS 1.x, AngularJS 2.0 and Web Components", | ||
"version": "2.3.4", | ||
"description": "Advanced Framework Agnostic Javascript Datagrid.", | ||
"main": "dist/ag-grid.min.js", | ||
@@ -6,0 +6,0 @@ "scripts": { |
@@ -5,2 +5,4 @@ | ||
"ag" stands for AGnostic | ||
#### Install with Bower | ||
@@ -49,14 +51,8 @@ ```sh | ||
I am not looking for contributors for this project. If you have ideas, feel free to | ||
ag-Grid is not looking for contributors for the project. If you have ideas, feel free to | ||
get in touch and let me know. Or if you want to suggest something, feel free to | ||
create a pull request with your ideas. | ||
My reason for not looking for contributors is that this grid is my hobby, | ||
something I work on in my spare time and enjoy. The design is something of a passion, | ||
and I'm bringing the grid into a particular direction. To take on contributors | ||
would require overhead of organisation, as well as agreeing direction (both | ||
technical implementation and functional requirements). | ||
If you would like to help, then please provide me with guidance and advice. | ||
I don't claim to know everything, so welcome others opinions on the direction | ||
of the project. |
@@ -67,3 +67,3 @@ module ag.grid { | ||
/** Comparator function for custom sorting. */ | ||
comparator?: Function; | ||
comparator?: (valueA: any, valueB: any, nodeA?: RowNode, nodeB?: RowNode, isInverted?: boolean) => number; | ||
@@ -70,0 +70,0 @@ /** Set to true to render a selection checkbox in the column. */ |
@@ -15,5 +15,5 @@ /// <reference path="../utils.ts" /> | ||
private valueGetter: any; | ||
private allUniqueValues: any; // all values in the table | ||
private availableUniqueValues: any; // all values not filtered by other rows | ||
private displayedValues: any; // all values we are rendering on screen (ie after mini filter) | ||
private allUniqueValues: any[]; // all values in the table | ||
private availableUniqueValues: any[]; // all values not filtered by other rows | ||
private displayedValues: any[]; // all values we are rendering on screen (ie after mini filter) | ||
private miniFilter: any; | ||
@@ -87,7 +87,3 @@ private selectedValuesCount: any; | ||
if (this.colDef.comparator) { | ||
this.allUniqueValues.sort(this.colDef.comparator); | ||
} else { | ||
this.allUniqueValues.sort(_.defaultComparator); | ||
} | ||
this.sortValues(this.allUniqueValues); | ||
} | ||
@@ -103,6 +99,12 @@ | ||
this.availableUniqueValues = _.toStrings(this.getUniqueValues(true)); | ||
if (this.colDef.comparator) { | ||
this.availableUniqueValues.sort(this.colDef.comparator); | ||
this.sortValues(this.availableUniqueValues); | ||
} | ||
private sortValues(values: any[]): void { | ||
if (this.filterParams && this.filterParams.comparator) { | ||
values.sort(this.filterParams.comparator); | ||
} else if (this.colDef.comparator) { | ||
values.sort(this.colDef.comparator); | ||
} else { | ||
this.availableUniqueValues.sort(_.defaultComparator); | ||
values.sort(_.defaultComparator); | ||
} | ||
@@ -109,0 +111,0 @@ } |
@@ -21,4 +21,7 @@ /** The filter parameters for set filter */ | ||
suppressRemoveEntries ?: boolean; | ||
/** Comparator for sorting. If not provided, the colDef comparator is used. If colDef also not provided, the default (agGrid provided) comparator is used.*/ | ||
comparator?: (a: any, b: any) => number; | ||
} | ||
} |
@@ -88,7 +88,3 @@ /// <reference path="constants.ts" /> | ||
// if no data provided initially, and not doing infinite scrolling, show the loading panel | ||
var showLoading = !this.gridOptionsWrapper.getRowData() && !this.gridOptionsWrapper.isVirtualPaging(); | ||
if (showLoading) { | ||
this.showLoadingOverlay(); | ||
} | ||
this.decideStartingOverlay(); | ||
@@ -112,2 +108,17 @@ // if datasource provided, use it | ||
private decideStartingOverlay() { | ||
// if not virtual paging, then we might need to show an overlay if no data | ||
var notDoingVirtualPaging = !this.gridOptionsWrapper.isVirtualPaging(); | ||
if (notDoingVirtualPaging) { | ||
var showLoading = !this.gridOptionsWrapper.getRowData(); | ||
var showNoData = this.gridOptionsWrapper.getRowData() && this.gridOptionsWrapper.getRowData().length == 0; | ||
if (showLoading) { | ||
this.showLoadingOverlay(); | ||
} | ||
if (showNoData) { | ||
this.showNoRowsOverlay(); | ||
} | ||
} | ||
} | ||
private addWindowResizeListener(): void { | ||
@@ -114,0 +125,0 @@ var that = this; |
@@ -382,2 +382,6 @@ /// <reference path="grid.ts" /> | ||
public dispatchEvent(eventType: string, event?: any): void { | ||
this.eventService.dispatchEvent(eventType, event); | ||
} | ||
public refreshPivot(): void { | ||
@@ -384,0 +388,0 @@ this.grid.refreshPivot(); |
@@ -130,3 +130,3 @@ /// <reference path="../utils.ts" /> | ||
if (nodeChildren) { | ||
index = this.recursivelyWalkNodesAndCallback(node.children, callback, recursionType, index); | ||
index = this.recursivelyWalkNodesAndCallback(nodeChildren, callback, recursionType, index); | ||
} | ||
@@ -133,0 +133,0 @@ } |
@@ -194,8 +194,9 @@ /// <reference path="vElement.ts" /> | ||
if (this.bound) { | ||
console.error('cannot setAttribute to already bound VHTMLElement'); | ||
this.element.setAttribute(key, value); | ||
} else { | ||
if (!this.attributes) { | ||
this.attributes = {}; | ||
} | ||
this.attributes[key] = value; | ||
} | ||
if (!this.attributes) { | ||
this.attributes = {}; | ||
} | ||
this.attributes[key] = value; | ||
} | ||
@@ -205,9 +206,10 @@ | ||
if (this.bound) { | ||
console.error('cannot addEventListener to already bound VHTMLElement'); | ||
this.element.addEventListener(event, listener); | ||
} else { | ||
if (!this.eventListeners) { | ||
this.eventListeners = []; | ||
} | ||
var entry = new VEventListener(event, listener); | ||
this.eventListeners.push(entry); | ||
} | ||
if (!this.eventListeners) { | ||
this.eventListeners = []; | ||
} | ||
var entry = new VEventListener(event, listener); | ||
this.eventListeners.push(entry); | ||
} | ||
@@ -214,0 +216,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
421
9290201
65810
57