Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/igniteui.angular2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ export class IgGridBase<Model> extends IgControlBase<Model> implements AfterCont
var diff = [],
element = jQuery(this._el),
grid = element.data(this._widgetName),
colIndex, td, i, j, pkKey = this._config.primaryKey, newFormattedVal, record, column;
td, i, j, pkKey = this._config.primaryKey, newFormattedVal, record, column;

if (typeof this._config.dataSource === "string") {
return;
Expand All @@ -521,11 +521,10 @@ export class IgGridBase<Model> extends IgControlBase<Model> implements AfterCont
this._dataSource = jQuery.extend(true, [], this._config.dataSource);
for (i = 0; i < diff.length; i++) {
for (j = 0; j < diff[i].txlog.length; j++) {
colIndex = element.data(this._widgetName)._getCellIndexByColumnKey(diff[i].txlog[j].key);
record = this._config.dataSource[diff[i].index];
td = element.find("tr[data-id='" + record[pkKey] + "']").children().get(colIndex);
td = grid._getCellsByColKey(element.find("tr[data-id='" + record[pkKey] + "']"), diff[i].txlog[j].key);

column = element.data(this._widgetName).columnByKey(diff[i].txlog[j].key);
column = grid.columnByKey(diff[i].txlog[j].key);
if (column) {
if (column.template) {
newFormattedVal = grid._renderTemplatedCell(diff[i].txlog[j].newVal, column);
Expand Down Expand Up @@ -1106,4 +1105,4 @@ export class IgVideoPlayerComponent extends IgControlBase<IgVideoPlayer> { const
export class IgRadialMenuComponent extends IgControlBase<IgRadialMenu> { constructor(el: ElementRef, renderer: Renderer, differs: IterableDiffers) { super(el, renderer, differs); } }

@IgComponent()
export class IgSplitButtonComponent extends IgControlBase<IgSplitButton> { constructor(el: ElementRef, renderer: Renderer, differs: IterableDiffers) { super(el, renderer, differs); } }
export class IgSplitButtonComponent extends IgControlBase<IgSplitButton> { constructor(el: ElementRef, renderer: Renderer, differs: IterableDiffers) { super(el, renderer, differs); } }