igniteui-webcomponents-inputs 4.8.0 → 4.8.1-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.
- package/bundles/igniteui-webcomponents-inputs.umd.js +1046 -730
- package/bundles/igniteui-webcomponents-inputs.umd.min.js +1 -1
- package/esm2015/lib/ButtonView_combined.js +22 -22
- package/esm2015/lib/CalendarView_combined.js +16 -14
- package/esm2015/lib/CheckboxView_combined.js +73 -67
- package/esm2015/lib/DatePickerView_combined.js +14 -14
- package/esm2015/lib/IconView_combined.js +663 -467
- package/esm2015/lib/IconVisualModelExport.js +13 -11
- package/esm2015/lib/InputGroupView_combined.js +29 -29
- package/esm2015/lib/NativeUIXInputsFactory.js +1 -1
- package/esm2015/lib/XButtonBridge.js +7 -0
- package/esm2015/lib/XIconBridge.js +58 -31
- package/esm2015/lib/XIconButtonBridge.js +1 -1
- package/esm2015/lib/igc-x-icon-component.js +113 -91
- package/esm5/lib/ButtonView_combined.js +22 -22
- package/esm5/lib/CalendarView_combined.js +16 -14
- package/esm5/lib/CheckboxView_combined.js +77 -67
- package/esm5/lib/DatePickerView_combined.js +14 -14
- package/esm5/lib/IconView_combined.js +685 -444
- package/esm5/lib/IconVisualModelExport.js +13 -11
- package/esm5/lib/InputGroupView_combined.js +29 -29
- package/esm5/lib/NativeUIXInputsFactory.js +1 -1
- package/esm5/lib/XButtonBridge.js +7 -0
- package/esm5/lib/XIconBridge.js +58 -31
- package/esm5/lib/XIconButtonBridge.js +1 -1
- package/esm5/lib/igc-x-icon-component.js +121 -91
- package/fesm2015/igniteui-webcomponents-inputs.js +1007 -748
- package/fesm5/igniteui-webcomponents-inputs.js +1047 -731
- package/lib/CheckboxView_combined.d.ts +17 -16
- package/lib/IconView_combined.d.ts +150 -134
- package/lib/IconVisualModelExport.d.ts +4 -3
- package/lib/XIconBridge.d.ts +3 -0
- package/lib/igc-x-icon-component.d.ts +10 -0
- package/package.json +2 -2
|
@@ -51,12 +51,12 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
51
51
|
_this.p = null;
|
|
52
52
|
return _this;
|
|
53
53
|
}
|
|
54
|
-
CheckboxView.prototype.
|
|
54
|
+
CheckboxView.prototype.af = function () {
|
|
55
55
|
};
|
|
56
56
|
CheckboxView.prototype.i = function () {
|
|
57
57
|
return true;
|
|
58
58
|
};
|
|
59
|
-
CheckboxView.prototype.
|
|
59
|
+
CheckboxView.prototype.ad = function (a) {
|
|
60
60
|
var e_1, _a;
|
|
61
61
|
if (a == null) {
|
|
62
62
|
try {
|
|
@@ -103,11 +103,11 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
103
103
|
this.r.setStyleProperty("appearance", "none");
|
|
104
104
|
this.r.setAttribute("type", "checkbox");
|
|
105
105
|
this.r.setAttribute("id", this.c.b1);
|
|
106
|
-
this.
|
|
107
|
-
this.j.add(c.listen("change", runOn(this, this.
|
|
108
|
-
this.j.add(c.listen("click", runOn(this, this.
|
|
109
|
-
this.j.add(c.listen("focus", runOn(this, this.
|
|
110
|
-
this.j.add(c.listen("blur", runOn(this, this.
|
|
106
|
+
this.aj();
|
|
107
|
+
this.j.add(c.listen("change", runOn(this, this.x)));
|
|
108
|
+
this.j.add(c.listen("click", runOn(this, this.y)));
|
|
109
|
+
this.j.add(c.listen("focus", runOn(this, this.z)));
|
|
110
|
+
this.j.add(c.listen("blur", runOn(this, this.w)));
|
|
111
111
|
this.l.append(c);
|
|
112
112
|
var d = this.l.createElement("div");
|
|
113
113
|
d.addClass("ig-checkbox-box");
|
|
@@ -191,16 +191,16 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
191
191
|
l.setStyleProperty("cursor", "pointer");
|
|
192
192
|
l.setStyleProperty("role", "label");
|
|
193
193
|
this.p = l;
|
|
194
|
-
this.j.add(l.listen("click", runOn(this, this.
|
|
194
|
+
this.j.add(l.listen("click", runOn(this, this.v)));
|
|
195
195
|
this.l.append(l);
|
|
196
196
|
this.l.getPortal(l, "ChildContent", function (m) {
|
|
197
197
|
}, true);
|
|
198
198
|
this.c.cp();
|
|
199
199
|
};
|
|
200
|
-
CheckboxView.prototype.
|
|
200
|
+
CheckboxView.prototype.v = function (a) {
|
|
201
201
|
this.c.toggle();
|
|
202
202
|
};
|
|
203
|
-
CheckboxView.prototype.
|
|
203
|
+
CheckboxView.prototype.aj = function () {
|
|
204
204
|
if (this.i()) {
|
|
205
205
|
var a = this.c.b1;
|
|
206
206
|
this.r.setAttribute("name", this.c.ca);
|
|
@@ -222,26 +222,26 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
222
222
|
this.r.setAttribute("aria-label", this.c.bm);
|
|
223
223
|
}
|
|
224
224
|
};
|
|
225
|
-
CheckboxView.prototype.
|
|
225
|
+
CheckboxView.prototype.al = function () {
|
|
226
226
|
return new Size(1, this.q.width(), this.q.height());
|
|
227
227
|
};
|
|
228
|
-
CheckboxView.prototype.
|
|
228
|
+
CheckboxView.prototype.ai = function () {
|
|
229
229
|
this.n.setAttribute("d", this.c.bf);
|
|
230
230
|
};
|
|
231
|
-
CheckboxView.prototype.
|
|
231
|
+
CheckboxView.prototype.ag = function () {
|
|
232
232
|
if (this.i()) {
|
|
233
233
|
var a = this.c.b1;
|
|
234
234
|
this.r.setAttribute("id", a);
|
|
235
235
|
this.q.setAttribute("for", a);
|
|
236
236
|
}
|
|
237
237
|
};
|
|
238
|
-
CheckboxView.prototype.
|
|
238
|
+
CheckboxView.prototype.w = function (a) {
|
|
239
239
|
this.c.focused = false;
|
|
240
240
|
};
|
|
241
|
-
CheckboxView.prototype.
|
|
241
|
+
CheckboxView.prototype.z = function (a) {
|
|
242
242
|
this.c.focused = true;
|
|
243
243
|
};
|
|
244
|
-
CheckboxView.prototype.
|
|
244
|
+
CheckboxView.prototype.y = function (a) {
|
|
245
245
|
a.stopPropagation();
|
|
246
246
|
if (this.h()) {
|
|
247
247
|
var native_ = this.r.getNativeElement();
|
|
@@ -252,10 +252,10 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
252
252
|
CheckboxView.prototype.h = function () {
|
|
253
253
|
return false;
|
|
254
254
|
};
|
|
255
|
-
CheckboxView.prototype.
|
|
255
|
+
CheckboxView.prototype.x = function (a) {
|
|
256
256
|
a.stopPropagation();
|
|
257
257
|
};
|
|
258
|
-
CheckboxView.prototype.
|
|
258
|
+
CheckboxView.prototype.aa = function () {
|
|
259
259
|
if (KeyFrameAnimationFactory.h == null) {
|
|
260
260
|
KeyFrameAnimationFactory.h = this.l;
|
|
261
261
|
}
|
|
@@ -266,8 +266,15 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
266
266
|
CheckboxView.prototype.b = function (a) {
|
|
267
267
|
return new AnimationKeyFrameEffect(0, this.o, 0, null, a);
|
|
268
268
|
};
|
|
269
|
-
CheckboxView.prototype.
|
|
269
|
+
CheckboxView.prototype.ab = function (a) {
|
|
270
270
|
};
|
|
271
|
+
Object.defineProperty(CheckboxView.prototype, "t", {
|
|
272
|
+
get: function () {
|
|
273
|
+
return this.q;
|
|
274
|
+
},
|
|
275
|
+
enumerable: false,
|
|
276
|
+
configurable: true
|
|
277
|
+
});
|
|
271
278
|
Object.defineProperty(CheckboxView.prototype, "s", {
|
|
272
279
|
get: function () {
|
|
273
280
|
return this.q;
|
|
@@ -282,22 +289,22 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
282
289
|
enumerable: false,
|
|
283
290
|
configurable: true
|
|
284
291
|
});
|
|
285
|
-
Object.defineProperty(CheckboxView.prototype, "
|
|
292
|
+
Object.defineProperty(CheckboxView.prototype, "u", {
|
|
286
293
|
get: function () {
|
|
287
294
|
return this.o;
|
|
288
295
|
},
|
|
289
296
|
enumerable: false,
|
|
290
297
|
configurable: true
|
|
291
298
|
});
|
|
292
|
-
CheckboxView.prototype.
|
|
299
|
+
CheckboxView.prototype.ac = function () {
|
|
293
300
|
this.g = true;
|
|
294
|
-
this.j.add(this.r.listen("change", runOn(this, this.
|
|
295
|
-
this.j.add(this.r.listen("click", runOn(this, this.
|
|
296
|
-
this.j.add(this.r.listen("focus", runOn(this, this.
|
|
297
|
-
this.j.add(this.r.listen("blur", runOn(this, this.
|
|
298
|
-
this.j.add(this.p.listen("click", runOn(this, this.
|
|
301
|
+
this.j.add(this.r.listen("change", runOn(this, this.x)));
|
|
302
|
+
this.j.add(this.r.listen("click", runOn(this, this.y)));
|
|
303
|
+
this.j.add(this.r.listen("focus", runOn(this, this.z)));
|
|
304
|
+
this.j.add(this.r.listen("blur", runOn(this, this.w)));
|
|
305
|
+
this.j.add(this.p.listen("click", runOn(this, this.v)));
|
|
299
306
|
};
|
|
300
|
-
CheckboxView.prototype.
|
|
307
|
+
CheckboxView.prototype.ae = function () {
|
|
301
308
|
var e_2, _a;
|
|
302
309
|
this.g = false;
|
|
303
310
|
try {
|
|
@@ -321,14 +328,14 @@ var CheckboxView = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
321
328
|
}
|
|
322
329
|
this.j.clear();
|
|
323
330
|
};
|
|
324
|
-
CheckboxView.prototype.
|
|
331
|
+
CheckboxView.prototype.ah = function () {
|
|
325
332
|
var model_ = this.c;
|
|
326
333
|
if (model_.externalObject && model_.externalObject.refreshDefaults) {
|
|
327
334
|
model_.externalObject.refreshDefaults();
|
|
328
335
|
}
|
|
329
336
|
;
|
|
330
337
|
};
|
|
331
|
-
CheckboxView.prototype.
|
|
338
|
+
CheckboxView.prototype.ak = function (a, b) {
|
|
332
339
|
this.d.ax = a;
|
|
333
340
|
this.d.aw = b;
|
|
334
341
|
};
|
|
@@ -404,7 +411,7 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
404
411
|
var a = new CheckboxView();
|
|
405
412
|
a.c = _this;
|
|
406
413
|
_this.view = a;
|
|
407
|
-
_this.view.
|
|
414
|
+
_this.view.af();
|
|
408
415
|
return _this;
|
|
409
416
|
}
|
|
410
417
|
Object.defineProperty(XCheckbox.prototype, "view", {
|
|
@@ -508,7 +515,7 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
508
515
|
this.ct();
|
|
509
516
|
break;
|
|
510
517
|
case "ActualCheckPath":
|
|
511
|
-
this.view.
|
|
518
|
+
this.view.ai();
|
|
512
519
|
break;
|
|
513
520
|
case "IsChecked":
|
|
514
521
|
if (!this.s) {
|
|
@@ -531,30 +538,32 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
531
538
|
this.view.e.i = this.y;
|
|
532
539
|
break;
|
|
533
540
|
case "InputId":
|
|
534
|
-
this.view.
|
|
541
|
+
this.view.ag();
|
|
535
542
|
break;
|
|
536
543
|
}
|
|
537
544
|
};
|
|
538
545
|
XCheckbox.prototype.ct = function () {
|
|
539
|
-
var a = this.view.
|
|
540
|
-
|
|
546
|
+
var a = this.view.t;
|
|
547
|
+
var b = this.view.s;
|
|
548
|
+
if (a == null || b == null) {
|
|
541
549
|
return;
|
|
542
550
|
}
|
|
543
551
|
NativeUI.o(a, new CornerRadius(0, this.ao));
|
|
552
|
+
NativeUI.o(b, new CornerRadius(0, this.ao));
|
|
544
553
|
if (!isNaN_(this.an)) {
|
|
545
|
-
NativeUI.p(
|
|
554
|
+
NativeUI.p(b, new Thickness(0, this.an));
|
|
546
555
|
}
|
|
547
556
|
if (this.checked) {
|
|
548
557
|
NativeUI.m(a, this.c8);
|
|
549
|
-
NativeUI.n(
|
|
558
|
+
NativeUI.n(b, this.c9);
|
|
550
559
|
}
|
|
551
560
|
else {
|
|
552
561
|
NativeUI.m(a, this.db);
|
|
553
|
-
NativeUI.n(
|
|
562
|
+
NativeUI.n(b, this.dc);
|
|
554
563
|
}
|
|
555
564
|
};
|
|
556
565
|
XCheckbox.prototype.cw = function () {
|
|
557
|
-
var a = this.view.
|
|
566
|
+
var a = this.view.u;
|
|
558
567
|
if (a == null) {
|
|
559
568
|
return;
|
|
560
569
|
}
|
|
@@ -1045,10 +1054,10 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1045
1054
|
XCheckbox.prototype.cp = function () {
|
|
1046
1055
|
this.ck();
|
|
1047
1056
|
if (this.checked) {
|
|
1048
|
-
this.view.
|
|
1057
|
+
this.view.ak(BrushUtil.q(this.c8, 0.6), BrushUtil.q(this.c8, 0.1));
|
|
1049
1058
|
}
|
|
1050
1059
|
else {
|
|
1051
|
-
this.view.
|
|
1060
|
+
this.view.ak(BrushUtil.q(this.c8, 0.6), BrushUtil.q(this.dc, 0.1));
|
|
1052
1061
|
}
|
|
1053
1062
|
};
|
|
1054
1063
|
Object.defineProperty(XCheckbox.prototype, "a", {
|
|
@@ -1062,12 +1071,12 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1062
1071
|
configurable: true
|
|
1063
1072
|
});
|
|
1064
1073
|
XCheckbox.prototype.ck = function () {
|
|
1065
|
-
this.view.
|
|
1074
|
+
this.view.aa();
|
|
1066
1075
|
var a = false;
|
|
1067
1076
|
if (this.o == null) {
|
|
1068
1077
|
if (!a) {
|
|
1069
1078
|
a = true;
|
|
1070
|
-
this.view.
|
|
1079
|
+
this.view.ah();
|
|
1071
1080
|
}
|
|
1072
1081
|
this.o = KeyFrameAnimationFactory.f.c(this.view.a(this.a).m(new AnimationKeyFrameProperty(2, this.db), new AnimationKeyFrameProperty(3, this.dc)).m(new AnimationKeyFrameProperty(2, this.c8), new AnimationKeyFrameProperty(3, this.c9)));
|
|
1073
1082
|
this.p = KeyFrameAnimationFactory.f.c(this.view.b(this.a).m(new AnimationKeyFrameProperty(19, 24), new AnimationKeyFrameProperty(1, 0)).m(new AnimationKeyFrameProperty(19, 0), new AnimationKeyFrameProperty(1, 1)));
|
|
@@ -1108,46 +1117,47 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1108
1117
|
c = -1;
|
|
1109
1118
|
}
|
|
1110
1119
|
if (b) {
|
|
1111
|
-
this.view.
|
|
1120
|
+
this.view.ak(BrushUtil.q(this.c8, 0.6), BrushUtil.q(this.c8, 0.1));
|
|
1112
1121
|
}
|
|
1113
1122
|
else {
|
|
1114
|
-
this.view.
|
|
1123
|
+
this.view.ak(BrushUtil.q(this.c8, 0.6), BrushUtil.q(this.dc, 0.1));
|
|
1115
1124
|
}
|
|
1116
1125
|
if (!this.indeterminate) {
|
|
1117
|
-
NativeUI.af(this.view.
|
|
1126
|
+
NativeUI.af(this.view.u, null);
|
|
1118
1127
|
}
|
|
1119
1128
|
if (this.z || this.indeterminate || a) {
|
|
1120
|
-
var d = this.view.
|
|
1121
|
-
var e = this.view.
|
|
1129
|
+
var d = this.view.t;
|
|
1130
|
+
var e = this.view.s;
|
|
1131
|
+
var f = this.view.u;
|
|
1122
1132
|
if (this.indeterminate) {
|
|
1123
|
-
var
|
|
1124
|
-
|
|
1133
|
+
var g = new TransformGroup();
|
|
1134
|
+
g.j.add(((function () {
|
|
1125
1135
|
var $ret = new RotateTransform();
|
|
1126
1136
|
$ret.j = 45;
|
|
1127
1137
|
return $ret;
|
|
1128
1138
|
})()));
|
|
1129
|
-
|
|
1139
|
+
g.j.add(((function () {
|
|
1130
1140
|
var $ret = new TranslateTransform();
|
|
1131
1141
|
$ret.j = -_this.view.k();
|
|
1132
1142
|
return $ret;
|
|
1133
1143
|
})()));
|
|
1134
1144
|
NativeUI.m(d, this.c8);
|
|
1135
|
-
NativeUI.n(
|
|
1136
|
-
NativeUI.y(
|
|
1137
|
-
NativeUI.ac(
|
|
1138
|
-
NativeUI.af(
|
|
1145
|
+
NativeUI.n(e, this.c9);
|
|
1146
|
+
NativeUI.y(f, 1);
|
|
1147
|
+
NativeUI.ac(f, 41);
|
|
1148
|
+
NativeUI.af(f, g);
|
|
1139
1149
|
}
|
|
1140
1150
|
else if (b) {
|
|
1141
1151
|
NativeUI.m(d, this.c8);
|
|
1142
|
-
NativeUI.n(
|
|
1143
|
-
NativeUI.y(
|
|
1144
|
-
NativeUI.ac(
|
|
1152
|
+
NativeUI.n(e, this.c9);
|
|
1153
|
+
NativeUI.y(f, 1);
|
|
1154
|
+
NativeUI.ac(f, 0);
|
|
1145
1155
|
}
|
|
1146
1156
|
else {
|
|
1147
1157
|
NativeUI.m(d, this.db);
|
|
1148
|
-
NativeUI.n(
|
|
1149
|
-
NativeUI.y(
|
|
1150
|
-
NativeUI.ac(
|
|
1158
|
+
NativeUI.n(e, this.dc);
|
|
1159
|
+
NativeUI.y(f, 0);
|
|
1160
|
+
NativeUI.ac(f, 24);
|
|
1151
1161
|
}
|
|
1152
1162
|
if (this.o.playState == 1) {
|
|
1153
1163
|
this.o.cancel();
|
|
@@ -1159,13 +1169,13 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1159
1169
|
}
|
|
1160
1170
|
if ((c > 0 && this.o.playbackRate < 0) || (c < 0 && this.o.playbackRate > 0)) {
|
|
1161
1171
|
this.o.reverse();
|
|
1162
|
-
this.o.finished.f(function (
|
|
1172
|
+
this.o.finished.f(function (h) {
|
|
1163
1173
|
if (_this.o != null) {
|
|
1164
1174
|
_this.o.commitStyles();
|
|
1165
1175
|
}
|
|
1166
1176
|
});
|
|
1167
1177
|
this.p.reverse();
|
|
1168
|
-
this.p.finished.f(function (
|
|
1178
|
+
this.p.finished.f(function (h) {
|
|
1169
1179
|
if (_this.p != null) {
|
|
1170
1180
|
_this.p.commitStyles();
|
|
1171
1181
|
}
|
|
@@ -1173,13 +1183,13 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1173
1183
|
}
|
|
1174
1184
|
else {
|
|
1175
1185
|
this.o.play();
|
|
1176
|
-
this.o.finished.f(function (
|
|
1186
|
+
this.o.finished.f(function (h) {
|
|
1177
1187
|
if (_this.o != null) {
|
|
1178
1188
|
_this.o.commitStyles();
|
|
1179
1189
|
}
|
|
1180
1190
|
});
|
|
1181
1191
|
this.p.play();
|
|
1182
|
-
this.p.finished.f(function (
|
|
1192
|
+
this.p.finished.f(function (h) {
|
|
1183
1193
|
if (_this.p != null) {
|
|
1184
1194
|
_this.p.commitStyles();
|
|
1185
1195
|
}
|
|
@@ -1187,10 +1197,10 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1187
1197
|
}
|
|
1188
1198
|
};
|
|
1189
1199
|
XCheckbox.prototype.onDetachedFromUI = function () {
|
|
1190
|
-
this.view.
|
|
1200
|
+
this.view.ae();
|
|
1191
1201
|
};
|
|
1192
1202
|
XCheckbox.prototype.onAttachedToUI = function () {
|
|
1193
|
-
this.view.
|
|
1203
|
+
this.view.ac();
|
|
1194
1204
|
};
|
|
1195
1205
|
XCheckbox.prototype.onContentReady = function () {
|
|
1196
1206
|
if (this.indeterminate) {
|
|
@@ -1230,7 +1240,7 @@ var XCheckbox = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1230
1240
|
return a;
|
|
1231
1241
|
};
|
|
1232
1242
|
XCheckbox.prototype.provideContainer = function (a) {
|
|
1233
|
-
this.view.
|
|
1243
|
+
this.view.ad(a);
|
|
1234
1244
|
};
|
|
1235
1245
|
XCheckbox.$t = markType(XCheckbox, 'XCheckbox', Base.$, [INotifyPropertyChanged_$type]);
|
|
1236
1246
|
XCheckbox.g = ThemeResolver.a(((function () {
|
|
@@ -1775,30 +1775,30 @@ var DatePicker = /** @class */ /*@__PURE__*/ (function (_super) {
|
|
|
1775
1775
|
a.a = this.c.bj();
|
|
1776
1776
|
if (this.ad != null) {
|
|
1777
1777
|
var b = this.ad;
|
|
1778
|
-
if (this.h != null && b.
|
|
1778
|
+
if (this.h != null && b.q == null) {
|
|
1779
1779
|
var c = this.h.d;
|
|
1780
1780
|
var d = FontUtil.getFontInfoFromString(c, b.fontString);
|
|
1781
|
-
b.p = d.p;
|
|
1782
|
-
b.e = d.e;
|
|
1783
1781
|
b.q = d.q;
|
|
1784
|
-
b.
|
|
1782
|
+
b.f = d.f;
|
|
1783
|
+
b.r = d.r;
|
|
1785
1784
|
b.t = d.t;
|
|
1786
1785
|
b.u = d.u;
|
|
1786
|
+
b.v = d.v;
|
|
1787
1787
|
}
|
|
1788
|
-
if (b.
|
|
1789
|
-
a.h = b.
|
|
1788
|
+
if (b.q != null) {
|
|
1789
|
+
a.h = b.q;
|
|
1790
1790
|
}
|
|
1791
|
-
if (!isNaN_(b.
|
|
1792
|
-
a.f = b.
|
|
1791
|
+
if (!isNaN_(b.f)) {
|
|
1792
|
+
a.f = b.f;
|
|
1793
1793
|
}
|
|
1794
|
-
if (b.
|
|
1795
|
-
a.l = b.
|
|
1794
|
+
if (b.v != null) {
|
|
1795
|
+
a.l = b.v;
|
|
1796
1796
|
}
|
|
1797
|
-
if (b.
|
|
1798
|
-
a.j = b.
|
|
1797
|
+
if (b.t != null) {
|
|
1798
|
+
a.j = b.t;
|
|
1799
1799
|
}
|
|
1800
|
-
if (b.
|
|
1801
|
-
a.i = b.
|
|
1800
|
+
if (b.r != null) {
|
|
1801
|
+
a.i = b.t;
|
|
1802
1802
|
}
|
|
1803
1803
|
}
|
|
1804
1804
|
return a;
|