Skip to content

Commit 1df409a

Browse files
authored
Merge pull request #235 from JiaLiPassion/issue-234
fix(controlbase): IgControlBase should not reference it's child IgGridBase
2 parents dee65f6 + 665c267 commit 1df409a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/igcontrolbase/igcontrolbase.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ElementRef, EventEmitter, Renderer, IterableDiffers, DoCheck } from '@angular/core';
2-
import { IgGridBase } from '../iggrid/iggridbase';
32

43
declare var jQuery: any;
54

@@ -115,8 +114,8 @@ export class IgControlBase<Model> implements DoCheck {
115114
jQuery.ui[this._widgetName].prototype.options.hasOwnProperty(name) &&
116115
jQuery(this._el).data(this._widgetName)) {
117116
jQuery(this._el)[this._widgetName]("option", name, value);
118-
if(name === "dataSource" && this instanceof IgGridBase) {
119-
this._dataSource = jQuery.extend(true, [], value);
117+
if(name === "dataSource" && typeof this.createDataSource === 'function') {
118+
this._dataSource = this.createDataSource(value);
120119
}
121120
}
122121
}

src/iggrid/iggridbase.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ export class IgGridBase<Model> extends IgControlBase<Model> implements AfterCont
4242
super.ngOnInit();
4343
}
4444

45+
createDataSource(value: any) {
46+
return jQuery.extend(true, [], value);
47+
}
48+
4549
deleteRow(id) {
4650
var element = jQuery(this._el),
4751
tr = element.find("tr[data-id='" + id + "']");

0 commit comments

Comments
 (0)