From 5a65fd67ba5208830e43991b15e807b48ed49f2d Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 27 Feb 2017 15:26:22 +0200 Subject: [PATCH 1/3] Fixing two-way binding with MRL grid. --- src/igniteui.angular2.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/igniteui.angular2.ts b/src/igniteui.angular2.ts index 81f6305..8982c69 100644 --- a/src/igniteui.angular2.ts +++ b/src/igniteui.angular2.ts @@ -502,7 +502,7 @@ export class IgGridBase extends IgControlBase 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; @@ -521,9 +521,8 @@ export class IgGridBase extends IgControlBase 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 = element.data(this._widgetName)._getCellsByColKey(element.find("tr[data-id='" + record[pkKey] + "']"), diff[i].txlog[j].key); column = element.data(this._widgetName).columnByKey(diff[i].txlog[j].key); if (column) { From cd258612499191619a0fcde9feebd7655db95801 Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 10 Mar 2017 13:23:34 +0200 Subject: [PATCH 2/3] Using cached element --- src/igniteui.angular2.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/igniteui.angular2.ts b/src/igniteui.angular2.ts index 8982c69..8038ecd 100644 --- a/src/igniteui.angular2.ts +++ b/src/igniteui.angular2.ts @@ -522,7 +522,7 @@ export class IgGridBase extends IgControlBase implements AfterCont for (i = 0; i < diff.length; i++) { for (j = 0; j < diff[i].txlog.length; j++) { record = this._config.dataSource[diff[i].index]; - td = element.data(this._widgetName)._getCellsByColKey(element.find("tr[data-id='" + record[pkKey] + "']"), diff[i].txlog[j].key); + 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); if (column) { From ed62dcadd7f9bd278f634cb4cf1595ae44c5fced Mon Sep 17 00:00:00 2001 From: Martin Pavlov Date: Fri, 10 Mar 2017 17:07:07 +0200 Subject: [PATCH 3/3] Using cached element - update --- src/igniteui.angular2.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/igniteui.angular2.ts b/src/igniteui.angular2.ts index 8038ecd..44481f0 100644 --- a/src/igniteui.angular2.ts +++ b/src/igniteui.angular2.ts @@ -524,7 +524,7 @@ export class IgGridBase extends IgControlBase implements AfterCont record = this._config.dataSource[diff[i].index]; 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); @@ -1105,4 +1105,4 @@ export class IgVideoPlayerComponent extends IgControlBase { const export class IgRadialMenuComponent extends IgControlBase { constructor(el: ElementRef, renderer: Renderer, differs: IterableDiffers) { super(el, renderer, differs); } } @IgComponent() -export class IgSplitButtonComponent extends IgControlBase { constructor(el: ElementRef, renderer: Renderer, differs: IterableDiffers) { super(el, renderer, differs); } } \ No newline at end of file +export class IgSplitButtonComponent extends IgControlBase { constructor(el: ElementRef, renderer: Renderer, differs: IterableDiffers) { super(el, renderer, differs); } }