igniteui-angular-data-grids 20.1.0-beta.0 → 20.2.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (192) hide show
  1. package/bundles/igniteui-angular-data-grids.umd.js +5727 -5576
  2. package/bundles/igniteui-angular-data-grids.umd.min.js +1 -1
  3. package/esm2015/lib/AccessibilityRow.js +1 -1
  4. package/esm2015/lib/CanvasCellPresenterBase.js +9 -9
  5. package/esm2015/lib/CanvasContentCellModelHelper.js +9 -9
  6. package/esm2015/lib/CanvasDateTimeCellPresenter.js +8 -8
  7. package/esm2015/lib/CanvasGridCellBase.js +7 -7
  8. package/esm2015/lib/CanvasImageCellPresenter.js +9 -9
  9. package/esm2015/lib/CanvasNumericCellPresenter.js +8 -8
  10. package/esm2015/lib/CanvasSectionHeaderCellPresenter.js +9 -9
  11. package/esm2015/lib/CanvasSummaryCell.js +1 -1
  12. package/esm2015/lib/CanvasSummaryCellPresenter.js +3 -3
  13. package/esm2015/lib/CanvasTemplateCellPresenter.js +4 -4
  14. package/esm2015/lib/CanvasTemplateHeaderCellPresenter.js +3 -3
  15. package/esm2015/lib/CanvasTextCellPresenter.js +9 -9
  16. package/esm2015/lib/CanvasTextHeaderCellPresenter.js +7 -7
  17. package/esm2015/lib/CellPresenterBase.js +40 -37
  18. package/esm2015/lib/CheckboxListBridge.js +4 -0
  19. package/esm2015/lib/CheckboxListView_combined.js +778 -743
  20. package/esm2015/lib/ColumnChooserView_combined.js +9 -9
  21. package/esm2015/lib/ColumnFilterCondition_combined.js +2894 -2867
  22. package/esm2015/lib/ColumnGroupingView_combined.js +4 -4
  23. package/esm2015/lib/ColumnPinningView_combined.js +7 -7
  24. package/esm2015/lib/ComparisonOperatorSelectorView_combined.js +7 -7
  25. package/esm2015/lib/ContentCellModelHelper.js +13 -13
  26. package/esm2015/lib/DataGridCellLayoutPanel.js +17 -17
  27. package/esm2015/lib/DateTimeCellPresenter.js +9 -9
  28. package/esm2015/lib/EditorCell.js +303 -303
  29. package/esm2015/lib/EditorCellPresenter.js +27 -27
  30. package/esm2015/lib/EditorRowCell.js +1 -1
  31. package/esm2015/lib/FilterCell.js +272 -272
  32. package/esm2015/lib/FilterCellPresenter.js +16 -16
  33. package/esm2015/lib/GridCellBase.js +354 -335
  34. package/esm2015/lib/GridColumnFilterOptionsView_combined.js +9 -9
  35. package/esm2015/lib/GridColumnGroupOptionsView_combined.js +4 -4
  36. package/esm2015/lib/GridColumnHideOptionsView_combined.js +1 -1
  37. package/esm2015/lib/GridColumnMoveOptionsView_combined.js +1 -1
  38. package/esm2015/lib/GridColumnOptionsView_combined.js +1 -1
  39. package/esm2015/lib/GridColumnPinOptionsView_combined.js +1 -1
  40. package/esm2015/lib/GridColumnSummaryOptionsView_combined.js +6 -6
  41. package/esm2015/lib/GridExternalWrapper.js +6 -6
  42. package/esm2015/lib/GridFilterDialogView_combined.js +1 -1
  43. package/esm2015/lib/GridSortIndicatorView_combined.js +15 -8
  44. package/esm2015/lib/ISummaryChooserView_combined.js +9 -9
  45. package/esm2015/lib/ImageCell.js +59 -59
  46. package/esm2015/lib/ImageCellPresenter.js +17 -17
  47. package/esm2015/lib/MultiColumnComboBoxView_combined.js +2 -2
  48. package/esm2015/lib/NumericCell.js +8 -8
  49. package/esm2015/lib/NumericCellPresenter.js +9 -9
  50. package/esm2015/lib/PropertyEditorView_combined.js +21 -21
  51. package/esm2015/lib/SectionHeaderCell.js +15 -15
  52. package/esm2015/lib/SectionHeaderCellPresenter.js +10 -10
  53. package/esm2015/lib/SortIndicatorStyle.js +6 -2
  54. package/esm2015/lib/SummaryCell.js +40 -40
  55. package/esm2015/lib/SummaryCellPresenter.js +10 -10
  56. package/esm2015/lib/TemplateCell.js +15 -15
  57. package/esm2015/lib/TemplateCellPresenter.js +5 -5
  58. package/esm2015/lib/TemplateHeader.js +2 -2
  59. package/esm2015/lib/TemplateHeaderCell.js +5 -5
  60. package/esm2015/lib/TemplateHeaderCellModel.js +18 -18
  61. package/esm2015/lib/TemplateHeaderCellPresenter.js +5 -5
  62. package/esm2015/lib/TextCell.js +32 -32
  63. package/esm2015/lib/TextCellPresenter.js +10 -10
  64. package/esm2015/lib/TextHeaderCell.js +153 -153
  65. package/esm2015/lib/TextHeaderCellPresenter.js +25 -25
  66. package/esm2015/lib/VerticalSeparatorCell.js +37 -37
  67. package/esm2015/lib/igx-cell-info.js +164 -155
  68. package/esm2015/lib/igx-checkbox-list-component.js +82 -66
  69. package/esm2015/lib/igx-combo-box-column-component.js +10 -10
  70. package/esm2015/lib/igx-data-grid-column-component.js +87 -76
  71. package/esm2015/lib/igx-date-time-cell-info.js +12 -12
  72. package/esm2015/lib/igx-date-time-column-component.js +20 -20
  73. package/esm2015/lib/igx-editor-cell-info.js +23 -23
  74. package/esm2015/lib/igx-filter-cell-info.js +26 -26
  75. package/esm2015/lib/igx-image-cell-info.js +6 -6
  76. package/esm2015/lib/igx-image-column-component.js +10 -10
  77. package/esm2015/lib/igx-numeric-cell-info.js +26 -26
  78. package/esm2015/lib/igx-numeric-column-component.js +30 -30
  79. package/esm2015/lib/igx-section-header-cell-info.js +6 -6
  80. package/esm2015/lib/igx-summary-cell-info.js +9 -9
  81. package/esm2015/lib/igx-template-cell-info.js +2 -2
  82. package/esm2015/lib/igx-template-header-cell-info.js +2 -2
  83. package/esm2015/lib/igx-text-cell-info.js +2 -2
  84. package/esm2015/lib/igx-text-column-component.js +8 -8
  85. package/esm2015/lib/igx-text-header-cell-info.js +10 -10
  86. package/esm5/lib/AccessibilityRow.js +1 -1
  87. package/esm5/lib/CanvasCellPresenterBase.js +9 -9
  88. package/esm5/lib/CanvasContentCellModelHelper.js +9 -9
  89. package/esm5/lib/CanvasDateTimeCellPresenter.js +8 -8
  90. package/esm5/lib/CanvasGridCellBase.js +7 -7
  91. package/esm5/lib/CanvasImageCellPresenter.js +9 -9
  92. package/esm5/lib/CanvasNumericCellPresenter.js +8 -8
  93. package/esm5/lib/CanvasSectionHeaderCellPresenter.js +9 -9
  94. package/esm5/lib/CanvasSummaryCell.js +1 -1
  95. package/esm5/lib/CanvasSummaryCellPresenter.js +3 -3
  96. package/esm5/lib/CanvasTemplateCellPresenter.js +4 -4
  97. package/esm5/lib/CanvasTemplateHeaderCellPresenter.js +3 -3
  98. package/esm5/lib/CanvasTextCellPresenter.js +9 -9
  99. package/esm5/lib/CanvasTextHeaderCellPresenter.js +7 -7
  100. package/esm5/lib/CellPresenterBase.js +40 -37
  101. package/esm5/lib/CheckboxListBridge.js +4 -0
  102. package/esm5/lib/CheckboxListView_combined.js +760 -725
  103. package/esm5/lib/ColumnChooserView_combined.js +9 -9
  104. package/esm5/lib/ColumnFilterCondition_combined.js +2735 -2700
  105. package/esm5/lib/ColumnGroupingView_combined.js +4 -4
  106. package/esm5/lib/ColumnPinningView_combined.js +7 -7
  107. package/esm5/lib/ComparisonOperatorSelectorView_combined.js +7 -7
  108. package/esm5/lib/ContentCellModelHelper.js +13 -13
  109. package/esm5/lib/DataGridCellLayoutPanel.js +17 -17
  110. package/esm5/lib/DateTimeCellPresenter.js +9 -9
  111. package/esm5/lib/EditorCell.js +285 -285
  112. package/esm5/lib/EditorCellPresenter.js +27 -27
  113. package/esm5/lib/EditorRowCell.js +1 -1
  114. package/esm5/lib/FilterCell.js +262 -262
  115. package/esm5/lib/FilterCellPresenter.js +16 -16
  116. package/esm5/lib/GridCellBase.js +349 -326
  117. package/esm5/lib/GridColumnFilterOptionsView_combined.js +9 -9
  118. package/esm5/lib/GridColumnGroupOptionsView_combined.js +4 -4
  119. package/esm5/lib/GridColumnHideOptionsView_combined.js +1 -1
  120. package/esm5/lib/GridColumnMoveOptionsView_combined.js +1 -1
  121. package/esm5/lib/GridColumnOptionsView_combined.js +1 -1
  122. package/esm5/lib/GridColumnPinOptionsView_combined.js +1 -1
  123. package/esm5/lib/GridColumnSummaryOptionsView_combined.js +6 -6
  124. package/esm5/lib/GridExternalWrapper.js +6 -6
  125. package/esm5/lib/GridFilterDialogView_combined.js +1 -1
  126. package/esm5/lib/GridSortIndicatorView_combined.js +15 -10
  127. package/esm5/lib/ISummaryChooserView_combined.js +9 -9
  128. package/esm5/lib/ImageCell.js +59 -59
  129. package/esm5/lib/ImageCellPresenter.js +17 -17
  130. package/esm5/lib/MultiColumnComboBoxView_combined.js +2 -2
  131. package/esm5/lib/NumericCell.js +8 -8
  132. package/esm5/lib/NumericCellPresenter.js +9 -9
  133. package/esm5/lib/PropertyEditorView_combined.js +21 -21
  134. package/esm5/lib/SectionHeaderCell.js +15 -15
  135. package/esm5/lib/SectionHeaderCellPresenter.js +10 -10
  136. package/esm5/lib/SortIndicatorStyle.js +6 -2
  137. package/esm5/lib/SummaryCell.js +40 -40
  138. package/esm5/lib/SummaryCellPresenter.js +10 -10
  139. package/esm5/lib/TemplateCell.js +15 -15
  140. package/esm5/lib/TemplateCellPresenter.js +5 -5
  141. package/esm5/lib/TemplateHeader.js +2 -2
  142. package/esm5/lib/TemplateHeaderCell.js +5 -5
  143. package/esm5/lib/TemplateHeaderCellModel.js +17 -17
  144. package/esm5/lib/TemplateHeaderCellPresenter.js +5 -5
  145. package/esm5/lib/TextCell.js +32 -32
  146. package/esm5/lib/TextCellPresenter.js +10 -10
  147. package/esm5/lib/TextHeaderCell.js +151 -151
  148. package/esm5/lib/TextHeaderCellPresenter.js +25 -25
  149. package/esm5/lib/VerticalSeparatorCell.js +37 -37
  150. package/esm5/lib/igx-cell-info.js +168 -155
  151. package/esm5/lib/igx-checkbox-list-component.js +82 -66
  152. package/esm5/lib/igx-combo-box-column-component.js +10 -10
  153. package/esm5/lib/igx-data-grid-column-component.js +91 -76
  154. package/esm5/lib/igx-date-time-cell-info.js +12 -12
  155. package/esm5/lib/igx-date-time-column-component.js +20 -20
  156. package/esm5/lib/igx-editor-cell-info.js +23 -23
  157. package/esm5/lib/igx-filter-cell-info.js +26 -26
  158. package/esm5/lib/igx-image-cell-info.js +6 -6
  159. package/esm5/lib/igx-image-column-component.js +10 -10
  160. package/esm5/lib/igx-numeric-cell-info.js +26 -26
  161. package/esm5/lib/igx-numeric-column-component.js +30 -30
  162. package/esm5/lib/igx-section-header-cell-info.js +6 -6
  163. package/esm5/lib/igx-summary-cell-info.js +9 -9
  164. package/esm5/lib/igx-template-cell-info.js +2 -2
  165. package/esm5/lib/igx-template-header-cell-info.js +2 -2
  166. package/esm5/lib/igx-text-cell-info.js +2 -2
  167. package/esm5/lib/igx-text-column-component.js +8 -8
  168. package/esm5/lib/igx-text-header-cell-info.js +10 -10
  169. package/fesm2015/igniteui-angular-data-grids.js +5924 -5791
  170. package/fesm5/igniteui-angular-data-grids.js +5729 -5578
  171. package/lib/CheckboxListBridge.d.ts +1 -0
  172. package/lib/CheckboxListViewExternal.d.ts +1 -0
  173. package/lib/CheckboxListView_combined.d.ts +185 -179
  174. package/lib/ColumnFilterCondition_combined.d.ts +820 -813
  175. package/lib/EditorCell.d.ts +67 -67
  176. package/lib/FilterCell.d.ts +55 -55
  177. package/lib/GridCellBase.d.ts +105 -102
  178. package/lib/ImageCell.d.ts +17 -17
  179. package/lib/NumericCell.d.ts +2 -2
  180. package/lib/SectionHeaderCell.d.ts +3 -3
  181. package/lib/SortIndicatorStyle.d.ts +5 -1
  182. package/lib/SummaryCell.d.ts +9 -9
  183. package/lib/TemplateCell.d.ts +5 -5
  184. package/lib/TemplateHeaderCell.d.ts +2 -2
  185. package/lib/TemplateHeaderCellModel.d.ts +7 -7
  186. package/lib/TextCell.d.ts +7 -7
  187. package/lib/TextHeaderCell.d.ts +29 -29
  188. package/lib/VerticalSeparatorCell.d.ts +8 -8
  189. package/lib/igx-cell-info.d.ts +6 -0
  190. package/lib/igx-checkbox-list-component.d.ts +10 -0
  191. package/lib/igx-data-grid-column-component.d.ts +7 -1
  192. package/package.json +4 -4
@@ -16,40 +16,40 @@ var TemplateHeaderCellModel = /** @class */ /*@__PURE__*/ (function (_super) {
16
16
  __extends(TemplateHeaderCellModel, _super);
17
17
  function TemplateHeaderCellModel() {
18
18
  var _this = _super !== null && _super.apply(this, arguments) || this;
19
- _this.n0 = false;
19
+ _this.n4 = false;
20
20
  return _this;
21
21
  }
22
- Object.defineProperty(TemplateHeaderCellModel.prototype, "n1", {
22
+ Object.defineProperty(TemplateHeaderCellModel.prototype, "n5", {
23
23
  get: function () {
24
- return this.n0;
24
+ return this.n4;
25
25
  },
26
26
  set: function (a) {
27
- var b = this.n0;
28
- this.n0 = a;
29
- if (this.n0 != b) {
30
- this.mb("IsFilterUIVisible", TemplateHeaderCellModel.n2, b, this.n0);
27
+ var b = this.n4;
28
+ this.n4 = a;
29
+ if (this.n4 != b) {
30
+ this.mf("IsFilterUIVisible", TemplateHeaderCellModel.n6, b, this.n4);
31
31
  }
32
32
  },
33
33
  enumerable: false,
34
34
  configurable: true
35
35
  });
36
- TemplateHeaderCellModel.prototype.mk = function (a, b) {
37
- _super.prototype.mk.call(this, a, b);
36
+ TemplateHeaderCellModel.prototype.mo = function (a, b) {
37
+ _super.prototype.mo.call(this, a, b);
38
38
  if (a == "IsFilterUIVisible") {
39
- this.n1 = b;
39
+ this.n5 = b;
40
40
  }
41
41
  };
42
- TemplateHeaderCellModel.prototype.lw = function (a) {
42
+ TemplateHeaderCellModel.prototype.l0 = function (a) {
43
43
  switch (a) {
44
44
  case "IsFilterUIVisible": return Boolean_$type;
45
45
  }
46
- return _super.prototype.lw.call(this, a);
46
+ return _super.prototype.l0.call(this, a);
47
47
  };
48
- TemplateHeaderCellModel.prototype.ia = function (a) {
48
+ TemplateHeaderCellModel.prototype.id = function (a) {
49
49
  if (a == "IsFilterUIVisible") {
50
- return this.n1;
50
+ return this.n5;
51
51
  }
52
- return _super.prototype.ia.call(this, a);
52
+ return _super.prototype.id.call(this, a);
53
53
  };
54
54
  TemplateHeaderCellModel.prototype.b = function (a) {
55
55
  if (a == null) {
@@ -57,11 +57,11 @@ var TemplateHeaderCellModel = /** @class */ /*@__PURE__*/ (function (_super) {
57
57
  }
58
58
  a = _super.prototype.b.call(this, a);
59
59
  var b = a;
60
- b.ae = this.ny;
60
+ b.ae = this.n2;
61
61
  return b;
62
62
  };
63
63
  TemplateHeaderCellModel.$t = markType(TemplateHeaderCellModel, 'TemplateHeaderCellModel', TemplateCellModel.$);
64
- TemplateHeaderCellModel.n2 = CellModel.f5("IsFilterUIVisible");
64
+ TemplateHeaderCellModel.n6 = CellModel.f7("IsFilterUIVisible");
65
65
  return TemplateHeaderCellModel;
66
66
  }(TemplateCellModel));
67
67
  export { TemplateHeaderCellModel };
@@ -30,13 +30,13 @@ var TemplateHeaderCellPresenter = /** @class */ /*@__PURE__*/ (function (_super)
30
30
  _super.prototype.b.call(this, a);
31
31
  var b = this.d.actualColumns._inner[a.l.a5];
32
32
  var c = b.header;
33
- if (a.bc(CellModel.fm) || a.bc(CellModel.h1)) {
34
- var d = Math.min(1, Math.max(0, a.c5));
35
- var e = a.cr * (1 - d);
36
- this.e.dt.element.setRawStyleProperty("opacity", e.toString());
33
+ if (a.bc(CellModel.fo) || a.bc(CellModel.h4)) {
34
+ var d = Math.min(1, Math.max(0, a.c7));
35
+ var e = a.cs * (1 - d);
36
+ this.e.dw.element.setRawStyleProperty("opacity", e.toString());
37
37
  }
38
38
  var f = a;
39
- c.hr(f, this.e.dt);
39
+ c.hr(f, this.e.dw);
40
40
  };
41
41
  TemplateHeaderCellPresenter.$t = markType(TemplateHeaderCellPresenter, 'TemplateHeaderCellPresenter', CellPresenterBase.$);
42
42
  return TemplateHeaderCellPresenter;
@@ -14,56 +14,56 @@ var TextCell = /** @class */ /*@__PURE__*/ (function (_super) {
14
14
  __extends(TextCell, _super);
15
15
  function TextCell(a) {
16
16
  var _this = _super.call(this, a) || this;
17
- _this.ds = null;
18
- _this.dv = -1;
19
- _this.du = -1;
20
- _this.ap.setRawStyleProperty("text-align", "left");
21
- _this.ap.setRawStyleProperty("vertical-align", "middle");
22
- _this.ds = a.createElement("span");
23
- _this.ds.setRawStyleProperty("display", "inline-block");
24
- _this.ds.setRawStyleProperty("overflow", "hidden");
25
- _this.ds.setRawStyleProperty("white-space", "nowrap");
26
- _this.ds.setRawStyleProperty("text-overflow", "ellipsis");
27
- _this.c7(_this.ds, 1);
28
- _this.ap.append(_this.ds);
17
+ _this.dv = null;
18
+ _this.dy = -1;
19
+ _this.dx = -1;
20
+ _this.ar.setRawStyleProperty("text-align", "left");
21
+ _this.ar.setRawStyleProperty("vertical-align", "middle");
22
+ _this.dv = a.createElement("span");
23
+ _this.dv.setRawStyleProperty("display", "inline-block");
24
+ _this.dv.setRawStyleProperty("overflow", "hidden");
25
+ _this.dv.setRawStyleProperty("white-space", "nowrap");
26
+ _this.dv.setRawStyleProperty("text-overflow", "ellipsis");
27
+ _this.da(_this.dv, 1);
28
+ _this.ar.append(_this.dv);
29
29
  return _this;
30
30
  }
31
- Object.defineProperty(TextCell.prototype, "dt", {
31
+ Object.defineProperty(TextCell.prototype, "dw", {
32
32
  get: function () {
33
- return this.ds;
33
+ return this.dv;
34
34
  },
35
35
  enumerable: false,
36
36
  configurable: true
37
37
  });
38
- TextCell.prototype.c8 = function (a, b) {
39
- _super.prototype.c8.call(this, a, b);
40
- var c = Math.max(0, a - b - (this.bb + this.bd + this.bc));
41
- if (this.dv != c) {
42
- this.dv = c;
43
- this.ds.setRawStyleProperty("max-width", c.toString() + "px");
38
+ TextCell.prototype.db = function (a, b) {
39
+ _super.prototype.db.call(this, a, b);
40
+ var c = Math.max(0, a - b - (this.bd + this.bf + this.be));
41
+ if (this.dy != c) {
42
+ this.dy = c;
43
+ this.dv.setRawStyleProperty("max-width", c.toString() + "px");
44
44
  }
45
45
  };
46
- TextCell.prototype.cy = function (a, b) {
47
- _super.prototype.cy.call(this, a, b);
46
+ TextCell.prototype.c1 = function (a, b) {
47
+ _super.prototype.c1.call(this, a, b);
48
48
  var c = Math.max(0, a - b);
49
- if (this.du != c) {
50
- this.du = c;
51
- this.ds.setRawStyleProperty("max-height", c.toString() + "px");
49
+ if (this.dx != c) {
50
+ this.dx = c;
51
+ this.dv.setRawStyleProperty("max-height", c.toString() + "px");
52
52
  }
53
53
  };
54
- TextCell.prototype.cx = function (a, b) {
55
- _super.prototype.cx.call(this, a, b);
56
- if (a == this.ds) {
57
- this.ds.setRawStyleProperty("line-height", (this.be - this.bf).toString() + "px");
54
+ TextCell.prototype.c0 = function (a, b) {
55
+ _super.prototype.c0.call(this, a, b);
56
+ if (a == this.dv) {
57
+ this.dv.setRawStyleProperty("line-height", (this.bg - this.bh).toString() + "px");
58
58
  }
59
59
  };
60
60
  TextCell.prototype.get_ae = function () {
61
61
  return true;
62
62
  };
63
- TextCell.prototype.ch = function (a, b, c) {
64
- _super.prototype.ch.call(this, a, b, c);
63
+ TextCell.prototype.ck = function (a, b, c) {
64
+ _super.prototype.ck.call(this, a, b, c);
65
65
  if (a == "Indent" || a == "IsCollapsable") {
66
- this.ds.setRawStyleProperty("margin-left", this.bb + this.bd + this.bc + "px");
66
+ this.dv.setRawStyleProperty("margin-left", this.bd + this.bf + this.be + "px");
67
67
  }
68
68
  };
69
69
  TextCell.$t = markType(TextCell, 'TextCell', GridCellBase.$);
@@ -28,26 +28,26 @@ var TextCellPresenter = /** @class */ /*@__PURE__*/ (function (_super) {
28
28
  _super.prototype.b.call(this, a);
29
29
  var b = a;
30
30
  if (a.a7) {
31
- if (a.bc(TextCellModel.nw) || a.bc(TextCellModel.hz) || a.bc(TextCellModel.gv)) {
32
- b.ku = this.e(b);
33
- this.d.c5(this.d.dt, b.ku);
31
+ if (a.bc(TextCellModel.n0) || a.bc(TextCellModel.h2) || a.bc(TextCellModel.gx)) {
32
+ b.kx = this.e(b);
33
+ this.d.c8(this.d.dw, b.kx);
34
34
  }
35
- ContentCellModelHelper.a(this.a.ak, b, this.a.ap, this.d.dt, this.a);
35
+ ContentCellModelHelper.a(this.a.am, b, this.a.ar, this.d.dw, this.a);
36
36
  }
37
37
  };
38
38
  TextCellPresenter.prototype.e = function (a) {
39
- if (a.lp != null) {
40
- return a.lp;
39
+ if (a.lt != null) {
40
+ return a.lt;
41
41
  }
42
- if (a.ny != null) {
43
- return a.ny;
42
+ if (a.n2 != null) {
43
+ return a.n2;
44
44
  }
45
45
  else {
46
- if (a.ib == null) {
46
+ if (a.ie == null) {
47
47
  return "";
48
48
  }
49
49
  else {
50
- return a.ib.toString();
50
+ return a.ie.toString();
51
51
  }
52
52
  }
53
53
  };