igniteui-webcomponents-charts 4.7.2-beta.0 → 4.7.2-beta.2

package/esm2015/lib/CategoryItemHighlightLayer_combined.js

@@ -37,7 +37,7 @@ import { DataTemplateMeasureInfo } from "igniteui-webcomponents-core";
  */
 export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
     class CategoryItemHighlightLayer extends AnnotationLayer {
-        bg() {
+        bc() {
             return new CategoryItemHighlightLayer();
         }
         get_d6() {
@@ -45,79 +45,79 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
         }
         constructor() {
             super();
-            this.w7 = false;
-            this.w6 = true;
-            this.xa = 10;
+            this.w8 = false;
+            this.w7 = true;
+            this.xb = 10;
             let a = new CategoryItemHighlightLayerFrame();
             let b = new CategoryItemHighlightLayerFrame();
             let c = new CategoryItemHighlightLayerFrame();
-            this.ug = a;
-            this.uf = b;
-            this.uh = c;
+            this.uh = a;
+            this.ug = b;
+            this.ui = c;
             this.ab = CategoryItemHighlightLayer.$;
         }
-        ch() {
+        cd() {
             return new CategoryItemHighlightLayerView(this);
         }
-        o1(a) {
-            super.o1(a);
-            this.w1 = a;
+        o2(a) {
+            super.o2(a);
+            this.w2 = a;
         }
-        vt(a, b) {
-            if (this.w5 == null || this.w5 == a) {
+        vu(a, b) {
+            if (this.w6 == null || this.w6 == a) {
                 if (!this.at.c) {
-                    this.pq(b);
+                    this.pr(b);
                 }
             }
         }
-        um(a) {
-            if (!super.um(a)) {
+        un(a) {
+            if (!super.un(a)) {
                 return false;
             }
-            if (this.xj != null) {
+            if (this.xk != null) {
                 if (a.eq) {
                     let b = a.lv();
-                    if (!Base.equalsStatic(this.xj, b)) {
+                    if (!Base.equalsStatic(this.xk, b)) {
                         return false;
                     }
                 }
                 else {
-                    if (!Base.equalsStatic(this.xj, a.name)) {
+                    if (!Base.equalsStatic(this.xk, a.name)) {
                         return false;
                     }
                 }
             }
-            let c = this.vo(a);
+            let c = this.vp(a);
             if (!c.c) {
                 return false;
             }
             return true;
         }
-        vv(a, b) {
-            super.vv(a, b);
+        vw(a, b) {
+            super.vw(a, b);
             let c = a;
-            let d = this.w9;
+            let d = this.xa;
             c.g.clear();
-            if (isNaN_(this.wy.x) && isNaN_(this.wy.y)) {
+            if (isNaN_(this.wz.x) && isNaN_(this.wz.y)) {
                 return;
             }
-            if (this.um(this.w5)) {
-                this.xp(this.w5, c, d);
+            if (this.un(this.w6)) {
+                this.xq(this.w6, c, d);
             }
             else {
-                for (let e of fromEnum(this.cz.series)) {
-                    if (this.um(e)) {
-                        this.xp(e, c, d);
+                for (let e of fromEnum(this.cv.series)) {
+                    if (this.un(e)) {
+                        this.xq(e, c, d);
                     }
                     if (e.isStacked) {
                         e.n6((f) => {
-                            if (this.um(f)) {
-                                this.xp(f, c, d);
+                            if (this.un(f)) {
+                                this.xq(f, c, d);
                             }
                             if (f.dw) {
                                 f.n4((g) => {
-                                    if (this.um(g)) {
-                                        this.xp(g, c, d);
+                                    if (this.un(g)) {
+                                        this.xq(g, c, d);
                                     }
                                     return true;
                                 });
@@ -127,8 +127,8 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
                     }
                     if (e.dw) {
                         e.n4((f) => {
-                            if (this.um(f)) {
-                                this.xp(f, c, d);
+                            if (this.un(f)) {
+                                this.xq(f, c, d);
                             }
                             return true;
                         });
@@ -136,38 +136,38 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
                 }
             }
         }
-        o9(a, b, c, d) {
-            super.o9(a, b, c, d);
+        pa(a, b, c, d) {
+            super.pa(a, b, c, d);
             switch (b) {
                 case CategoryItemHighlightLayer.$$p[4]:
                 case CategoryItemHighlightLayer.$$p[5]:
                 case CategoryItemHighlightLayer.$$p[2]:
                 case CategoryItemHighlightLayer.$$p[3]:
-                    this.pq(true);
+                    this.pr(true);
                     break;
                 case CategoryItemHighlightLayer.$$p[7]:
                 case CategoryItemHighlightLayer.$$p[8]:
-                    this.pq(true);
+                    this.pr(true);
                     break;
                 case CategoryItemHighlightLayer.$$p[9]:
-                    this.w7 = d;
-                    this.pq(true);
+                    this.w8 = d;
+                    this.pr(true);
                     break;
                 case CategoryItemHighlightLayer.$$p[1]:
-                    this.pq(true);
+                    this.pr(true);
                     break;
                 case CategoryItemHighlightLayer.$$p[0]:
-                    this.xa = this.xb;
-                    this.pq(true);
+                    this.xb = this.xc;
+                    this.pr(true);
                     break;
                 case CategoryItemHighlightLayer.$$p[6]:
-                    this.w6 = d;
-                    this.pq(true);
+                    this.w7 = d;
+                    this.pr(true);
                     break;
             }
         }
-        xp(a, b, c) {
-            if (this.ck == null || this.ck.by.isEmpty || this.ck.bx.isEmpty) {
+        xq(a, b, c) {
+            if (this.cg == null || this.cg.by.isEmpty || this.cg.bx.isEmpty) {
                 return;
             }
             if (!a.ed && !a.el) {
@@ -177,11 +177,11 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
             if (d.categoryAxis == null) {
                 return;
             }
-            let e = this.wy.x;
-            e = this.ck.bx.left + this.ck.bx.width * (e - this.ck.by.left) / this.ck.by.width;
-            let f = this.wy.y;
-            f = this.ck.bx.top + this.ck.bx.height * (f - this.ck.by.top) / this.ck.by.height;
-            let g = this.w8;
+            let e = this.wz.x;
+            e = this.cg.bx.left + this.cg.bx.width * (e - this.cg.by.left) / this.cg.by.width;
+            let f = this.wz.y;
+            f = this.cg.bx.top + this.cg.bx.height * (f - this.cg.by.top) / this.cg.by.height;
+            let g = this.w9;
             let h = true;
             let i = typeCast(IHasCategoryModePreference_$type, a);
             let j = 0;
@@ -192,18 +192,18 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
                 }
             }
             let k = true;
-            if (!h || this.w2 == 2) {
+            if (!h || this.w3 == 2) {
                 k = false;
             }
-            if (this.w2 == 1) {
+            if (this.w3 == 1) {
                 k = true;
             }
-            let l = this.vo(a);
+            let l = this.vp(a);
             if (!l.c) {
                 return;
             }
             if (k) {
-                let m = a.ti(l.d, this.w9, g);
+                let m = a.tj(l.d, this.xa, g);
                 if (j != 0 && !d.categoryAxis.cn) {
                     let n = m.x;
                     if (a.el) {
@@ -218,122 +218,122 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
                     }
                 }
                 if (!isNaN_(m.x) && !isNaN_(m.y)) {
-                    m = this.tn(m);
+                    m = this.to(m);
                 }
-                this.xn(m, b, a);
+                this.xo(m, b, a);
             }
             else {
-                let o = a.ti(l.d, this.w9, g);
+                let o = a.tj(l.d, this.xa, g);
                 let p;
-                let q = this.getEffectiveViewport1(this.ck);
+                let q = this.getEffectiveViewport1(this.cg);
                 if (a.isVertical) {
                     let r = o.y;
                     let s = d.categoryAxis;
-                    let t = this.xa;
+                    let t = this.xb;
                     if (j != 0) {
-                        t = s.k4(this.ck.by, this.ck.bx, q);
+                        t = s.k4(this.cg.by, this.cg.bx, q);
                     }
                     if (isNaN_(t) || isInfinity(t)) {
                         return;
                     }
-                    p = new Rect(0, this.tx.left, r - t / 2, this.tx.width, t);
+                    p = new Rect(0, this.ty.left, r - t / 2, this.ty.width, t);
                 }
                 else {
                     let u = o.x;
                     let v = d.categoryAxis;
-                    let w = this.xa;
+                    let w = this.xb;
                     if (j != 0) {
-                        w = v.k4(this.ck.by, this.ck.bx, q);
+                        w = v.k4(this.cg.by, this.cg.bx, q);
                     }
                     if (isNaN_(w) || isInfinity(w)) {
                         return;
                     }
-                    p = new Rect(0, u - w / 2, this.tx.top, w, this.tx.height);
+                    p = new Rect(0, u - w / 2, this.ty.top, w, this.ty.height);
                 }
-                p.intersect(this.ck.bx);
-                this.xo(p, b, a);
+                p.intersect(this.cg.bx);
+                this.xp(p, b, a);
             }
         }
-        xn(a, b, c) {
+        xo(a, b, c) {
             let d = new ItemHighlightFrameRect();
             d.b = a.x;
             d.e = a.y;
-            d.i = this.wo();
-            if (this.x3 != null) {
-                d.i = this.x3;
-            }
-            d.j = this.wp();
+            d.i = this.wp();
             if (this.x4 != null) {
-                d.j = this.x4;
+                d.i = this.x4;
+            }
+            d.j = this.wq();
+            if (this.x5 != null) {
+                d.j = this.x5;
             }
             if (d.i == null) {
                 if (c.hasMarkers) {
-                    d.i = this.w1.cl(c.s0());
+                    d.i = this.w2.cl(c.s1());
                 }
                 else {
-                    d.i = this.w1.cl(c.st);
+                    d.i = this.w2.cl(c.su);
                 }
             }
             if (d.j == null) {
                 if (c.hasMarkers) {
-                    d.j = this.w1.cl(c.s1());
+                    d.j = this.w2.cl(c.s2());
                 }
                 else {
-                    d.j = this.w1.cl(c.sw);
+                    d.j = this.w2.cl(c.sx);
                 }
             }
             d.d = this.hl;
             d.f = Base.getHashCodeStatic(c);
-            d.g = this.w3(c, a);
-            let e = (typeCast(MarkerSeries.$, c) !== null) ? c.uv : null;
-            if (e == null || e == MarkerSeries.uy || (this.w4 != 2 && this.w4 != 0)) {
-                let f = MarkerSeries.uc(c, 2);
-                if (this.w4 != 2 && this.w4 != 0) {
-                    f = this.w4;
+            d.g = this.w4(c, a);
+            let e = (typeCast(MarkerSeries.$, c) !== null) ? c.uw : null;
+            if (e == null || e == MarkerSeries.uz || (this.w5 != 2 && this.w5 != 0)) {
+                let f = MarkerSeries.ud(c, 2);
+                if (this.w5 != 2 && this.w5 != 0) {
+                    f = this.w5;
                 }
                 switch (f) {
                     case 3:
                     case 13:
-                        e = this.cz.py;
+                        e = this.cv.p2;
                         break;
                     case 4:
-                        e = this.cz.p7;
+                        e = this.cv.qb;
                         break;
                     case 5:
-                        e = this.cz.p4;
+                        e = this.cv.p8;
                         break;
                     case 6:
-                        e = this.cz.p5;
+                        e = this.cv.p9;
                         break;
                     case 7:
-                        e = this.cz.pz;
+                        e = this.cv.p3;
                         break;
                     case 8:
-                        e = this.cz.p2;
+                        e = this.cv.p6;
                         break;
                     case 9:
-                        e = this.cz.p0;
+                        e = this.cv.p4;
                         break;
                     case 10:
-                        e = this.cz.p6;
+                        e = this.cv.qa;
                         break;
                     case 11:
-                        e = this.cz.p3;
+                        e = this.cv.p7;
                         break;
                     case 12:
-                        e = this.cz.p1;
+                        e = this.cv.p5;
                         break;
                 }
             }
-            d.h = this.xs != null ? this.xs : e;
+            d.h = this.xt != null ? this.xt : e;
             if (!isNaN_(d.b) && !isNaN_(d.e)) {
                 b.g.addItem(d.f, d);
             }
         }
-        w3(a, b) {
+        w4(a, b) {
             let c = a.js(b);
             let d = a.hw(b);
-            if (this.w9 && d != Math.floor(d)) {
+            if (this.xa && d != Math.floor(d)) {
                 c = null;
             }
             return ((() => {
@@ -343,22 +343,22 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
                 return $ret;
             })());
         }
-        xo(a, b, c) {
+        xp(a, b, c) {
             let d = new ItemHighlightFrameRect();
             d.b = a.left;
             d.e = a.top;
             d.c = a.right;
             d.a = a.bottom;
-            d.i = this.wo();
-            d.j = this.wp();
+            d.i = this.wp();
+            d.j = this.wq();
             if (d.i == null) {
                 if (c != null) {
-                    d.i = this.w1.cm(c.st);
+                    d.i = this.w2.cm(c.su);
                 }
             }
             if (d.j == null) {
                 if (c != null) {
-                    d.j = this.w1.cm(c.sw);
+                    d.j = this.w2.cm(c.sx);
                 }
             }
             d.d = this.hl;
@@ -367,29 +367,29 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
                 b.g.addItem(d.f, d);
             }
         }
-        vy(a, b) {
-            super.vy(a, b);
-            let c = this.w1.b9;
-            let d = this.w1.b8;
+        vz(a, b) {
+            super.vz(a, b);
+            let c = this.w2.b9;
+            let d = this.w2.b8;
             let e = 0;
             let f = 0;
             let g = a;
             for (let h of fromEnum(g.g.values)) {
                 if (h.h != null) {
                     let i = d.item(f);
-                    this.xq(h, i);
+                    this.xr(h, i);
                     f++;
                 }
                 else {
                     let j = c.item(e);
-                    this.xr(h, j);
+                    this.xs(h, j);
                     e++;
                 }
             }
             c.count = e;
             d.count = f;
         }
-        xq(a, b) {
+        xr(a, b) {
             if (isNaN_(a.b) || isNaN_(a.e) || isNaN_(a.d) || a.g == null) {
                 b._visibility = 1;
                 return;
@@ -397,34 +397,34 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
             let c = { $type: Point_$type, x: a.b, y: a.e };
             let d = a.g;
             d.itemBrush = a.i;
-            let e = d.series.ti(c, this.dk() || this.w7, this.w6);
+            let e = d.series.tj(c, this.dk() || this.w8, this.w7);
             if (isNaN_(e.x) || isNaN_(e.y)) {
                 b._visibility = 1;
                 return;
             }
-            this.w1.cf(b, e.x, e.y);
+            this.w2.cf(b, e.x, e.y);
             b.ah = a.h;
             b.content = a.g;
         }
-        xr(a, b) {
+        xs(a, b) {
             if (isNaN_(a.b) || isNaN_(a.e) || isNaN_(a.a) || isNaN_(a.c) || isNaN_(a.d)) {
                 b._visibility = 1;
                 return;
             }
-            this.w1.cg(b, a.b, a.e, a.c - a.b, a.a - a.e);
+            this.w2.cg(b, a.b, a.e, a.c - a.b, a.a - a.e);
             b._fill = a.i;
             b._stroke = a.j;
             b.ad = a.d;
-            if (this.s8 != null) {
-                b.ai = this.s8;
+            if (this.s9 != null) {
+                b.ai = this.s9;
             }
             else {
                 b.ai = null;
             }
-            b.aj = this.s9;
-            b.am = this.tb;
-            b.al = this.ta;
-            b.ak = this.ta;
+            b.aj = this.ta;
+            b.am = this.tc;
+            b.al = this.tb;
+            b.ak = this.tb;
             b.ac = this.im;
         }
         fn() {
@@ -432,7 +432,7 @@ export let CategoryItemHighlightLayer = /*@__PURE__*/ (() => {
         }
     }
     CategoryItemHighlightLayer.$t = /*@__PURE__*/ markType(CategoryItemHighlightLayer, 'CategoryItemHighlightLayer', AnnotationLayer.$);
-    CategoryItemHighlightLayer.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, CategoryItemHighlightLayer, 'raisePropertyChanged', ['BandHighlightWidth:xb:xt', [1, 10], 'HighlightType:w2:xu', [CategoryItemHighlightType_$type, /*@__PURE__*/ enumGetBox(CategoryItemHighlightType_$type, 0)], 'MarkerBrush:x3:xv', [Brush.$, null], 'MarkerOutline:x4:xw', [Brush.$, null], 'MarkerTemplate:xs:xx', [DataTemplate.$, null], 'MarkerType:w4:xy', [MarkerType_$type, /*@__PURE__*/ enumGetBox(MarkerType_$type, 2)], 'SkipUnknownValues:w8:xz', [0, true], 'TargetSeriesName:xj:x0', [2, null], 'TargetSeries:w5:x1', [Series.$, null], 'UseInterpolation:w9:x2', [0, false]]);
+    CategoryItemHighlightLayer.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, CategoryItemHighlightLayer, 'raisePropertyChanged', ['BandHighlightWidth:xc:xu', [1, 10], 'HighlightType:w3:xv', [CategoryItemHighlightType_$type, /*@__PURE__*/ enumGetBox(CategoryItemHighlightType_$type, 0)], 'MarkerBrush:x4:xw', [Brush.$, null], 'MarkerOutline:x5:xx', [Brush.$, null], 'MarkerTemplate:xt:xy', [DataTemplate.$, null], 'MarkerType:w5:xz', [MarkerType_$type, /*@__PURE__*/ enumGetBox(MarkerType_$type, 2)], 'SkipUnknownValues:w9:x0', [0, true], 'TargetSeriesName:xk:x1', [2, null], 'TargetSeries:w6:x2', [Series.$, null], 'UseInterpolation:xa:x3', [0, false]]);
     return CategoryItemHighlightLayer;
 })();
 /**
@@ -549,7 +549,7 @@ export let CategoryItemHighlightLayerView = /*@__PURE__*/ (() => {
                 }
                 let e = d.series;
                 if (e.hasMarkers) {
-                    d.outline = e.s1();
+                    d.outline = e.s2();
                 }
                 d.thickness = e.ht();
             }
@@ -643,10 +643,10 @@ export let CategoryItemHighlightLayerView = /*@__PURE__*/ (() => {
         an(a) {
             super.an(a);
             for (let b = 0; b < this.cb.count; b++) {
-                this.e.a9.exportRectangleData(a, this.cb._inner[b], "catItemRect", ["Main", "CategoryItem"]);
+                this.e.a5.exportRectangleData(a, this.cb._inner[b], "catItemRect", ["Main", "CategoryItem"]);
             }
             for (let c = 0; c < this.ca.count; c++) {
-                this.e.a9.exportMarkerVisualDataFromMarker(this.e, a, this.ca._inner[c]);
+                this.e.a5.exportMarkerVisualDataFromMarker(this.e, a, this.ca._inner[c]);
             }
         }
     }

package/esm2015/lib/CategoryMarkerManager.js

@@ -11,7 +11,7 @@ import { Base, markType } from "igniteui-webcomponents-core";
 export let CategoryMarkerManager = /*@__PURE__*/ (() => {
     class CategoryMarkerManager extends Base {
         static e(a, b, c, d) {
-            let e = a.ud();
+            let e = a.ue();
             if (c == null) {
                 return;
             }

package/esm2015/lib/CategorySeriesInteractionManager.js

@@ -8,7 +8,7 @@ import { Base, typeCast, markType } from "igniteui-webcomponents-core";
 import { ICategorySeriesInteractionManager_$type } from "./ICategorySeriesInteractionManager";
 import { ScalerParams } from "./ScalerParams";
 import { ISortingAxis_$type } from "./ISortingAxis";
-import { HighlightingInfo } from "./HighlightingInfo";
+import { HighlightingInfo } from "igniteui-webcomponents-core";
 import { intDivide, truncate, isNaN_ } from "igniteui-webcomponents-core";
 /**
  * @hidden
@@ -16,11 +16,11 @@ import { intDivide, truncate, isNaN_ } from "igniteui-webcomponents-core";
 export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
     class CategorySeriesInteractionManager extends Base {
         b$c(a, b) {
-            let c = a.ck.by;
-            let d = a.ck.bx;
+            let c = a.cg.by;
+            let d = a.cg.bx;
             let e = a.as();
-            let f = a.getEffectiveViewport1(a.ck);
-            let g = a.tp(a.ck);
+            let f = a.getEffectiveViewport1(a.cg);
+            let g = a.tq(a.cg);
             let h = -1;
             if (e != null && !c.isEmpty && !d.isEmpty) {
                 let i = new ScalerParams(0, c, d, e.ch, f);
@@ -52,9 +52,9 @@ export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
             return c >= 0 && a.c7 != null && c < a.c7.count ? a.c7.item(c) : null;
         }
         b$d(a, b) {
-            let c = a.ck.by;
-            let d = a.ck.bx;
-            let e = a.getEffectiveViewport1(a.ck);
+            let c = a.cg.by;
+            let d = a.cg.bx;
+            let e = a.getEffectiveViewport1(a.cg);
             if (c.isEmpty || d.isEmpty) {
                 return -1;
             }
@@ -66,7 +66,7 @@ export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
                 return -1;
             }
             let g = typeCast(ISortingAxis_$type, f);
-            let h = a.tp(a.ck);
+            let h = a.tq(a.cg);
             let i = new ScalerParams(0, c, d, f.ch, e);
             let j = 0;
             if (f.cl) {
@@ -84,8 +84,8 @@ export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
             return p;
         }
         b$e(a, b, c) {
-            let d = a.ck.bx;
-            let e = a.ck.by;
+            let d = a.cg.bx;
+            let e = a.cg.by;
             let f = a.as();
             let g = 0;
             if (f.cp) {
@@ -168,13 +168,13 @@ export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
                 k = truncate(Math.floor((intDivide(n, e)))) * e;
                 l = k + (e - 1);
             }
-            if (h != null && h.h == k && h.g == l) {
+            if (h != null && h.g == k && h.f == l) {
                 return h;
             }
             let o = new HighlightingInfo();
-            o.b = a;
-            o.h = k;
-            o.g = l;
+            o.i = a;
+            o.g = k;
+            o.f = l;
             return o;
         }
         b$b(a, b, c, d, e, f, g, h) {
@@ -204,7 +204,7 @@ export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
                 k = m;
                 l = m;
             }
-            if (h != null && h.h == k && h.g == l) {
+            if (h != null && h.g == k && h.f == l) {
                 return h;
             }
             let p = b;
@@ -218,14 +218,14 @@ export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
             for (let r = 0; r < q; r++) {
                 if (p._inner[r].al == m) {
                     let s = new HighlightingInfo();
-                    s.b = a;
-                    s.h = p._inner[r].al;
+                    s.i = a;
                     s.g = p._inner[r].al;
-                    s.e = true;
+                    s.f = p._inner[r].al;
+                    s.d = true;
                     return s;
                 }
             }
-            let t = a.td(g);
+            let t = a.te(g);
             let u = p._inner[0].al;
             if (a.isVertical) {
                 let v = e._inner[p._inner[0].al][0];
@@ -254,11 +254,11 @@ export let CategorySeriesInteractionManager = /*@__PURE__*/ (() => {
                 }
             }
             let ad = new HighlightingInfo();
-            ad.b = a;
-            ad.e = true;
-            ad.h = u;
-            ad.g = ad.h;
-            if (h != null && h.h == ad.h && h.g == ad.g) {
+            ad.i = a;
+            ad.d = true;
+            ad.g = u;
+            ad.f = ad.g;
+            if (h != null && h.g == ad.g && h.f == ad.f) {
                 return h;
             }
             return ad;