igniteui-webcomponents-inputs 4.7.1 → 4.7.2-beta.1

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.
@@ -2896,30 +2896,30 @@ export let XButton = /*@__PURE__*/ (() => {
2896
2896
  c.l = this.disabled;
2897
2897
  if (this.aa != null) {
2898
2898
  let g = this.aa;
2899
- if (this.view != null && g.n == null) {
2899
+ if (this.view != null && g.p == null) {
2900
2900
  let h = this.view.k;
2901
2901
  let i = FontUtil.getFontInfoFromString(h, g.fontString);
2902
- g.n = i.n;
2903
- g.d = i.d;
2904
- g.o = i.o;
2902
+ g.p = i.p;
2903
+ g.e = i.e;
2905
2904
  g.q = i.q;
2906
- g.r = i.r;
2907
2905
  g.s = i.s;
2906
+ g.t = i.t;
2907
+ g.u = i.u;
2908
2908
  }
2909
- if (g.n != null) {
2910
- c.ac = g.n;
2909
+ if (g.p != null) {
2910
+ c.ac = g.p;
2911
2911
  }
2912
- if (!isNaN_(g.d)) {
2913
- c.r = g.d;
2912
+ if (!isNaN_(g.e)) {
2913
+ c.r = g.e;
2914
+ }
2915
+ if (g.u != null) {
2916
+ c.ag = g.u;
2914
2917
  }
2915
2918
  if (g.s != null) {
2916
- c.ag = g.s;
2919
+ c.ae = g.s;
2917
2920
  }
2918
2921
  if (g.q != null) {
2919
- c.ae = g.q;
2920
- }
2921
- if (g.o != null) {
2922
- c.ad = g.q;
2922
+ c.ad = g.s;
2923
2923
  }
2924
2924
  }
2925
2925
  return c;
@@ -2753,30 +2753,30 @@ export let XCalendar = /*@__PURE__*/ (() => {
2753
2753
  }
2754
2754
  if (this.v != null) {
2755
2755
  let w = this.v;
2756
- if (this.h != null && w.n == null) {
2756
+ if (this.h != null && w.p == null) {
2757
2757
  let x = this.h.m;
2758
2758
  let y = FontUtil.getFontInfoFromString(x, w.fontString);
2759
- w.n = y.n;
2760
- w.d = y.d;
2761
- w.o = y.o;
2759
+ w.p = y.p;
2760
+ w.e = y.e;
2762
2761
  w.q = y.q;
2763
- w.r = y.r;
2764
2762
  w.s = y.s;
2763
+ w.t = y.t;
2764
+ w.u = y.u;
2765
2765
  }
2766
- if (w.n != null) {
2767
- a.p = w.n;
2766
+ if (w.p != null) {
2767
+ a.p = w.p;
2768
2768
  }
2769
- if (!isNaN_(w.d)) {
2770
- a.m = w.d;
2769
+ if (!isNaN_(w.e)) {
2770
+ a.m = w.e;
2771
+ }
2772
+ if (w.u != null) {
2773
+ a.t = w.u;
2771
2774
  }
2772
2775
  if (w.s != null) {
2773
- a.t = w.s;
2776
+ a.r = w.s;
2774
2777
  }
2775
2778
  if (w.q != null) {
2776
- a.r = w.q;
2777
- }
2778
- if (w.o != null) {
2779
- a.q = w.q;
2779
+ a.q = w.s;
2780
2780
  }
2781
2781
  }
2782
2782
  return a;
@@ -1451,7 +1451,7 @@ export let DatePicker = /*@__PURE__*/ (() => {
1451
1451
  this.u = new Popup();
1452
1452
  this.u.aq = this.aw;
1453
1453
  this.u.ax = this.a2;
1454
- this.u.cw = BrushUtil.h(255, 255, 255, 255);
1454
+ this.u.cy = BrushUtil.h(255, 255, 255, 255);
1455
1455
  this.u.a8 = 150;
1456
1456
  this.h.at(this.u);
1457
1457
  this.c = new XCalendar();
@@ -1529,7 +1529,7 @@ export let DatePicker = /*@__PURE__*/ (() => {
1529
1529
  }
1530
1530
  dj(a, b) {
1531
1531
  if (this.ax) {
1532
- this.u.cn(this.h.d.rootWrapper.getNativeElement(), a, b);
1532
+ this.u.cp(this.h.d.rootWrapper.getNativeElement(), a, b);
1533
1533
  }
1534
1534
  else {
1535
1535
  let c = this.h.a0(true);
@@ -1551,27 +1551,27 @@ export let DatePicker = /*@__PURE__*/ (() => {
1551
1551
  if (f < 0) {
1552
1552
  if (this.u.r != 1) {
1553
1553
  this.u.r = 1;
1554
- this.u.b7(b);
1554
+ this.u.b9(b);
1555
1555
  }
1556
1556
  }
1557
1557
  else {
1558
1558
  if (this.u.r != 2) {
1559
1559
  this.u.r = 2;
1560
- this.u.b7(b);
1560
+ this.u.b9(b);
1561
1561
  }
1562
1562
  }
1563
1563
  }
1564
1564
  else {
1565
1565
  if (this.u.r != 1) {
1566
1566
  this.u.r = 1;
1567
- this.u.b7(b);
1567
+ this.u.b9(b);
1568
1568
  }
1569
1569
  }
1570
1570
  }
1571
1571
  }
1572
1572
  cq() {
1573
1573
  if (this.u != null) {
1574
- window.setTimeout(() => this.u.b3(), 0);
1574
+ window.setTimeout(() => this.u.b5(), 0);
1575
1575
  }
1576
1576
  if (this.c != null) {
1577
1577
  this.c.cy();
@@ -1646,30 +1646,30 @@ export let DatePicker = /*@__PURE__*/ (() => {
1646
1646
  a.a = this.c.bj();
1647
1647
  if (this.ad != null) {
1648
1648
  let b = this.ad;
1649
- if (this.h != null && b.n == null) {
1649
+ if (this.h != null && b.p == null) {
1650
1650
  let c = this.h.d;
1651
1651
  let d = FontUtil.getFontInfoFromString(c, b.fontString);
1652
- b.n = d.n;
1653
- b.d = d.d;
1654
- b.o = d.o;
1652
+ b.p = d.p;
1653
+ b.e = d.e;
1655
1654
  b.q = d.q;
1656
- b.r = d.r;
1657
1655
  b.s = d.s;
1656
+ b.t = d.t;
1657
+ b.u = d.u;
1658
1658
  }
1659
- if (b.n != null) {
1660
- a.h = b.n;
1659
+ if (b.p != null) {
1660
+ a.h = b.p;
1661
1661
  }
1662
- if (!isNaN_(b.d)) {
1663
- a.f = b.d;
1662
+ if (!isNaN_(b.e)) {
1663
+ a.f = b.e;
1664
+ }
1665
+ if (b.u != null) {
1666
+ a.l = b.u;
1664
1667
  }
1665
1668
  if (b.s != null) {
1666
- a.l = b.s;
1669
+ a.j = b.s;
1667
1670
  }
1668
1671
  if (b.q != null) {
1669
- a.j = b.q;
1670
- }
1671
- if (b.o != null) {
1672
- a.i = b.q;
1672
+ a.i = b.s;
1673
1673
  }
1674
1674
  }
1675
1675
  return a;
@@ -769,30 +769,30 @@ export let XIcon = /*@__PURE__*/ (() => {
769
769
  a.svgPath = this.svgPath;
770
770
  if (this.k != null) {
771
771
  let d = this.k;
772
- if (this.view != null && d.n == null) {
772
+ if (this.view != null && d.p == null) {
773
773
  let e = this.view.o;
774
774
  let f = FontUtil.getFontInfoFromString(e, d.fontString);
775
- d.n = f.n;
776
- d.d = f.d;
777
- d.o = f.o;
775
+ d.p = f.p;
776
+ d.e = f.e;
778
777
  d.q = f.q;
779
- d.r = f.r;
780
778
  d.s = f.s;
779
+ d.t = f.t;
780
+ d.u = f.u;
781
781
  }
782
- if (d.n != null) {
783
- a.l = d.n;
782
+ if (d.p != null) {
783
+ a.l = d.p;
784
784
  }
785
- if (!isNaN_(d.d)) {
786
- a.g = d.d;
785
+ if (!isNaN_(d.e)) {
786
+ a.g = d.e;
787
+ }
788
+ if (d.u != null) {
789
+ a.p = d.u;
787
790
  }
788
791
  if (d.s != null) {
789
- a.p = d.s;
792
+ a.n = d.s;
790
793
  }
791
794
  if (d.q != null) {
792
- a.n = d.q;
793
- }
794
- if (d.o != null) {
795
- a.m = d.q;
795
+ a.m = d.s;
796
796
  }
797
797
  }
798
798
  return a;
@@ -4670,30 +4670,30 @@ export let XLabel = /*@__PURE__*/ (() => {
4670
4670
  a.p = this.e;
4671
4671
  if (this.w != null) {
4672
4672
  let c = this.w;
4673
- if (this.view != null && c.n == null) {
4673
+ if (this.view != null && c.p == null) {
4674
4674
  let d = this.view.k;
4675
4675
  let e = FontUtil.getFontInfoFromString(d, c.fontString);
4676
- c.n = e.n;
4677
- c.d = e.d;
4678
- c.o = e.o;
4676
+ c.p = e.p;
4677
+ c.e = e.e;
4679
4678
  c.q = e.q;
4680
- c.r = e.r;
4681
4679
  c.s = e.s;
4680
+ c.t = e.t;
4681
+ c.u = e.u;
4682
4682
  }
4683
- if (c.n != null) {
4684
- a.s = c.n;
4683
+ if (c.p != null) {
4684
+ a.s = c.p;
4685
4685
  }
4686
- if (!isNaN_(c.d)) {
4687
- a.k = c.d;
4686
+ if (!isNaN_(c.e)) {
4687
+ a.k = c.e;
4688
+ }
4689
+ if (c.u != null) {
4690
+ a.w = c.u;
4688
4691
  }
4689
4692
  if (c.s != null) {
4690
- a.w = c.s;
4693
+ a.u = c.s;
4691
4694
  }
4692
4695
  if (c.q != null) {
4693
- a.u = c.q;
4694
- }
4695
- if (c.o != null) {
4696
- a.t = c.q;
4696
+ a.t = c.s;
4697
4697
  }
4698
4698
  }
4699
4699
  return a;
@@ -4786,7 +4786,7 @@ export let XInput = /*@__PURE__*/ (() => {
4786
4786
  this.view = a;
4787
4787
  this.view.as();
4788
4788
  XInput.ae = new FontInfo();
4789
- XInput.ae.n = "Verdana";
4789
+ XInput.ae.p = "Verdana";
4790
4790
  }
4791
4791
  get view() {
4792
4792
  return this._view;
@@ -5344,30 +5344,30 @@ export let XInput = /*@__PURE__*/ (() => {
5344
5344
  a.k = this.e;
5345
5345
  if (this.ad != null) {
5346
5346
  let c = this.ad;
5347
- if (this.view != null && c.n == null) {
5347
+ if (this.view != null && c.p == null) {
5348
5348
  let d = this.view.l;
5349
5349
  let e = FontUtil.getFontInfoFromString(d, c.fontString);
5350
- c.n = e.n;
5351
- c.d = e.d;
5352
- c.o = e.o;
5350
+ c.p = e.p;
5351
+ c.e = e.e;
5353
5352
  c.q = e.q;
5354
- c.r = e.r;
5355
5353
  c.s = e.s;
5354
+ c.t = e.t;
5355
+ c.u = e.u;
5356
5356
  }
5357
- if (c.n != null) {
5358
- a.o = c.n;
5357
+ if (c.p != null) {
5358
+ a.o = c.p;
5359
5359
  }
5360
- if (!isNaN_(c.d)) {
5361
- a.g = c.d;
5360
+ if (!isNaN_(c.e)) {
5361
+ a.g = c.e;
5362
+ }
5363
+ if (c.u != null) {
5364
+ a.s = c.u;
5362
5365
  }
5363
5366
  if (c.s != null) {
5364
- a.s = c.s;
5367
+ a.q = c.s;
5365
5368
  }
5366
5369
  if (c.q != null) {
5367
- a.q = c.q;
5368
- }
5369
- if (c.o != null) {
5370
- a.p = c.q;
5370
+ a.p = c.s;
5371
5371
  }
5372
5372
  }
5373
5373
  return a;
@@ -20,9 +20,9 @@ import { NativeUICheckbox } from "igniteui-webcomponents-core";
20
20
  import { XIcon } from "./XIcon";
21
21
  import { XIconBridge } from "./XIconBridge";
22
22
  import { NativeUIIcon } from "igniteui-webcomponents-core";
23
+ import { Popup } from "igniteui-webcomponents-core";
23
24
  import { XPopupBridge } from "./XPopupBridge";
24
25
  import { NativeUIPopup } from "igniteui-webcomponents-core";
25
- import { Popup } from "igniteui-webcomponents-core";
26
26
  /**
27
27
  * @hidden
28
28
  */
@@ -152,7 +152,7 @@ export let XPopupBridge = /*@__PURE__*/ (() => {
152
152
  case 25: return c.al;
153
153
  case 26: return c.a8;
154
154
  case 17: return c.a0;
155
- case 23: return c.cw;
155
+ case 23: return c.cy;
156
156
  case 35: switch (c.p) {
157
157
  case 1: return enumGetBox(NativeUIPopupAnimationType_$type, 1);
158
158
  default: return enumGetBox(NativeUIPopupAnimationType_$type, 0);
@@ -165,7 +165,7 @@ export let XPopupBridge = /*@__PURE__*/ (() => {
165
165
  case 1: return enumGetBox(NativeUIPopupPointerPosition_$type, 1);
166
166
  default: return enumGetBox(NativeUIPopupPointerPosition_$type, 2);
167
167
  }
168
- case 42: return c.c0;
168
+ case 42: return c.c2;
169
169
  case 39: return c.an;
170
170
  case 61: return c.a3;
171
171
  }
@@ -184,7 +184,7 @@ export let XPopupBridge = /*@__PURE__*/ (() => {
184
184
  d.a0 = c;
185
185
  break;
186
186
  case 23:
187
- d.cw = c;
187
+ d.cy = c;
188
188
  break;
189
189
  case 35:
190
190
  switch (EnumUtil.getEnumValue(NativeUIPopupAnimationType_$type, c)) {
@@ -209,7 +209,7 @@ export let XPopupBridge = /*@__PURE__*/ (() => {
209
209
  d.at = c;
210
210
  break;
211
211
  case 42:
212
- d.c0 = c;
212
+ d.c2 = c;
213
213
  break;
214
214
  case 43:
215
215
  switch (EnumUtil.getEnumValue(NativeUIPopupPointerPosition_$type, c)) {
@@ -234,13 +234,13 @@ export let XPopupBridge = /*@__PURE__*/ (() => {
234
234
  a.showRelativeToExclusionRect(b, this.v(c), this.u(d));
235
235
  }
236
236
  close(a) {
237
- a.b3();
237
+ a.b5();
238
238
  }
239
239
  notifyContentSizeChanged(a) {
240
- a.b6();
240
+ a.b8();
241
241
  }
242
242
  notifyExclusionRectChanged(a, b) {
243
- a.b7(b);
243
+ a.b9(b);
244
244
  }
245
245
  v(a) {
246
246
  switch (a) {
@@ -38,7 +38,12 @@ export class IgcXButtonGroupButtonCollection extends IgCollection {
38
38
  if (!ext) {
39
39
  ext = IgcXButtonComponent._createFromInternal(int);
40
40
  if (ext) {
41
- ext._implementation = int;
41
+ if (!int.$type && ext._implementation.setNativeElement) {
42
+ ext._implementation.setNativeElement(int);
43
+ }
44
+ else {
45
+ ext._implementation = int;
46
+ }
42
47
  }
43
48
  }
44
49
  return ext;
@@ -10,8 +10,9 @@ import { ControlDisplayDensity_$type } from "igniteui-webcomponents-core";
10
10
  import { BaseControlTheme_$type } from "igniteui-webcomponents-core";
11
11
  import { DayOfWeek_$type } from "./DayOfWeek";
12
12
  import { FirstWeek_$type } from "./FirstWeek";
13
+ import { IgcHTMLElement } from "igniteui-webcomponents-core";
13
14
  export let IgcXCalendarComponent = /*@__PURE__*/ (() => {
14
- class IgcXCalendarComponent extends HTMLElement {
15
+ class IgcXCalendarComponent extends IgcHTMLElement {
15
16
  set height(value) {
16
17
  this._height = value;
17
18
  this.style.height = value;
@@ -38,7 +38,12 @@ export class IgcXInputGroupInputCollection extends IgCollection {
38
38
  if (!ext) {
39
39
  ext = IgcXInputGroupItemComponent._createFromInternal(int);
40
40
  if (ext) {
41
- ext._implementation = int;
41
+ if (!int.$type && ext._implementation.setNativeElement) {
42
+ ext._implementation.setNativeElement(int);
43
+ }
44
+ else {
45
+ ext._implementation = int;
46
+ }
42
47
  }
43
48
  }
44
49
  return ext;
@@ -3590,30 +3590,30 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
3590
3590
  c.l = this.disabled;
3591
3591
  if (this.aa != null) {
3592
3592
  var g = this.aa;
3593
- if (this.view != null && g.n == null) {
3593
+ if (this.view != null && g.p == null) {
3594
3594
  var h = this.view.k;
3595
3595
  var i = FontUtil.getFontInfoFromString(h, g.fontString);
3596
- g.n = i.n;
3597
- g.d = i.d;
3598
- g.o = i.o;
3596
+ g.p = i.p;
3597
+ g.e = i.e;
3599
3598
  g.q = i.q;
3600
- g.r = i.r;
3601
3599
  g.s = i.s;
3600
+ g.t = i.t;
3601
+ g.u = i.u;
3602
3602
  }
3603
- if (g.n != null) {
3604
- c.ac = g.n;
3603
+ if (g.p != null) {
3604
+ c.ac = g.p;
3605
3605
  }
3606
- if (!isNaN_(g.d)) {
3607
- c.r = g.d;
3606
+ if (!isNaN_(g.e)) {
3607
+ c.r = g.e;
3608
+ }
3609
+ if (g.u != null) {
3610
+ c.ag = g.u;
3608
3611
  }
3609
3612
  if (g.s != null) {
3610
- c.ag = g.s;
3613
+ c.ae = g.s;
3611
3614
  }
3612
3615
  if (g.q != null) {
3613
- c.ae = g.q;
3614
- }
3615
- if (g.o != null) {
3616
- c.ad = g.q;
3616
+ c.ad = g.s;
3617
3617
  }
3618
3618
  }
3619
3619
  return c;
@@ -2877,30 +2877,30 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
2877
2877
  }
2878
2878
  if (this.v != null) {
2879
2879
  var w = this.v;
2880
- if (this.h != null && w.n == null) {
2880
+ if (this.h != null && w.p == null) {
2881
2881
  var x = this.h.m;
2882
2882
  var y = FontUtil.getFontInfoFromString(x, w.fontString);
2883
- w.n = y.n;
2884
- w.d = y.d;
2885
- w.o = y.o;
2883
+ w.p = y.p;
2884
+ w.e = y.e;
2886
2885
  w.q = y.q;
2887
- w.r = y.r;
2888
2886
  w.s = y.s;
2887
+ w.t = y.t;
2888
+ w.u = y.u;
2889
2889
  }
2890
- if (w.n != null) {
2891
- a.p = w.n;
2890
+ if (w.p != null) {
2891
+ a.p = w.p;
2892
2892
  }
2893
- if (!isNaN_(w.d)) {
2894
- a.m = w.d;
2893
+ if (!isNaN_(w.e)) {
2894
+ a.m = w.e;
2895
+ }
2896
+ if (w.u != null) {
2897
+ a.t = w.u;
2895
2898
  }
2896
2899
  if (w.s != null) {
2897
- a.t = w.s;
2900
+ a.r = w.s;
2898
2901
  }
2899
2902
  if (w.q != null) {
2900
- a.r = w.q;
2901
- }
2902
- if (w.o != null) {
2903
- a.q = w.q;
2903
+ a.q = w.s;
2904
2904
  }
2905
2905
  }
2906
2906
  return a;
@@ -1570,7 +1570,7 @@ var DatePicker = /** @class */ /*@__PURE__*/ (function (_super) {
1570
1570
  this.u = new Popup();
1571
1571
  this.u.aq = this.aw;
1572
1572
  this.u.ax = this.a2;
1573
- this.u.cw = BrushUtil.h(255, 255, 255, 255);
1573
+ this.u.cy = BrushUtil.h(255, 255, 255, 255);
1574
1574
  this.u.a8 = 150;
1575
1575
  this.h.at(this.u);
1576
1576
  this.c = new XCalendar();
@@ -1648,7 +1648,7 @@ var DatePicker = /** @class */ /*@__PURE__*/ (function (_super) {
1648
1648
  };
1649
1649
  DatePicker.prototype.dj = function (a, b) {
1650
1650
  if (this.ax) {
1651
- this.u.cn(this.h.d.rootWrapper.getNativeElement(), a, b);
1651
+ this.u.cp(this.h.d.rootWrapper.getNativeElement(), a, b);
1652
1652
  }
1653
1653
  else {
1654
1654
  var c = this.h.a0(true);
@@ -1670,20 +1670,20 @@ var DatePicker = /** @class */ /*@__PURE__*/ (function (_super) {
1670
1670
  if (f < 0) {
1671
1671
  if (this.u.r != 1) {
1672
1672
  this.u.r = 1;
1673
- this.u.b7(b);
1673
+ this.u.b9(b);
1674
1674
  }
1675
1675
  }
1676
1676
  else {
1677
1677
  if (this.u.r != 2) {
1678
1678
  this.u.r = 2;
1679
- this.u.b7(b);
1679
+ this.u.b9(b);
1680
1680
  }
1681
1681
  }
1682
1682
  }
1683
1683
  else {
1684
1684
  if (this.u.r != 1) {
1685
1685
  this.u.r = 1;
1686
- this.u.b7(b);
1686
+ this.u.b9(b);
1687
1687
  }
1688
1688
  }
1689
1689
  }
@@ -1691,7 +1691,7 @@ var DatePicker = /** @class */ /*@__PURE__*/ (function (_super) {
1691
1691
  DatePicker.prototype.cq = function () {
1692
1692
  var _this = this;
1693
1693
  if (this.u != null) {
1694
- window.setTimeout(function () { return _this.u.b3(); }, 0);
1694
+ window.setTimeout(function () { return _this.u.b5(); }, 0);
1695
1695
  }
1696
1696
  if (this.c != null) {
1697
1697
  this.c.cy();
@@ -1770,30 +1770,30 @@ var DatePicker = /** @class */ /*@__PURE__*/ (function (_super) {
1770
1770
  a.a = this.c.bj();
1771
1771
  if (this.ad != null) {
1772
1772
  var b = this.ad;
1773
- if (this.h != null && b.n == null) {
1773
+ if (this.h != null && b.p == null) {
1774
1774
  var c = this.h.d;
1775
1775
  var d = FontUtil.getFontInfoFromString(c, b.fontString);
1776
- b.n = d.n;
1777
- b.d = d.d;
1778
- b.o = d.o;
1776
+ b.p = d.p;
1777
+ b.e = d.e;
1779
1778
  b.q = d.q;
1780
- b.r = d.r;
1781
1779
  b.s = d.s;
1780
+ b.t = d.t;
1781
+ b.u = d.u;
1782
1782
  }
1783
- if (b.n != null) {
1784
- a.h = b.n;
1783
+ if (b.p != null) {
1784
+ a.h = b.p;
1785
1785
  }
1786
- if (!isNaN_(b.d)) {
1787
- a.f = b.d;
1786
+ if (!isNaN_(b.e)) {
1787
+ a.f = b.e;
1788
+ }
1789
+ if (b.u != null) {
1790
+ a.l = b.u;
1788
1791
  }
1789
1792
  if (b.s != null) {
1790
- a.l = b.s;
1793
+ a.j = b.s;
1791
1794
  }
1792
1795
  if (b.q != null) {
1793
- a.j = b.q;
1794
- }
1795
- if (b.o != null) {
1796
- a.i = b.q;
1796
+ a.i = b.s;
1797
1797
  }
1798
1798
  }
1799
1799
  return a;
@@ -966,30 +966,30 @@ var XIcon = /** @class */ /*@__PURE__*/ (function (_super) {
966
966
  a.svgPath = this.svgPath;
967
967
  if (this.k != null) {
968
968
  var d = this.k;
969
- if (this.view != null && d.n == null) {
969
+ if (this.view != null && d.p == null) {
970
970
  var e = this.view.o;
971
971
  var f = FontUtil.getFontInfoFromString(e, d.fontString);
972
- d.n = f.n;
973
- d.d = f.d;
974
- d.o = f.o;
972
+ d.p = f.p;
973
+ d.e = f.e;
975
974
  d.q = f.q;
976
- d.r = f.r;
977
975
  d.s = f.s;
976
+ d.t = f.t;
977
+ d.u = f.u;
978
978
  }
979
- if (d.n != null) {
980
- a.l = d.n;
979
+ if (d.p != null) {
980
+ a.l = d.p;
981
981
  }
982
- if (!isNaN_(d.d)) {
983
- a.g = d.d;
982
+ if (!isNaN_(d.e)) {
983
+ a.g = d.e;
984
+ }
985
+ if (d.u != null) {
986
+ a.p = d.u;
984
987
  }
985
988
  if (d.s != null) {
986
- a.p = d.s;
989
+ a.n = d.s;
987
990
  }
988
991
  if (d.q != null) {
989
- a.n = d.q;
990
- }
991
- if (d.o != null) {
992
- a.m = d.q;
992
+ a.m = d.s;
993
993
  }
994
994
  }
995
995
  return a;