targetj 1.0.239 → 1.0.241
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/Export.js +28 -5
- package/build/$Dom.js +21 -25
- package/build/AnimationManager.js +39 -44
- package/build/AnimationUtil.js +41 -45
- package/build/App.js +73 -74
- package/build/BaseModel.js +86 -90
- package/build/Bracket.js +7 -11
- package/build/BracketGenerator.js +15 -19
- package/build/ColorUtil.js +3 -8
- package/build/DomInit.js +34 -38
- package/build/Easing.js +3 -8
- package/build/EventListener.js +63 -67
- package/build/LoadingManager.js +34 -38
- package/build/LocationManager.js +52 -56
- package/build/Moves.js +17 -21
- package/build/PageManager.js +64 -68
- package/build/RunScheduler.js +46 -50
- package/build/ScheduleUtil.js +20 -24
- package/build/SearchUtil.js +16 -20
- package/build/TModel.js +52 -56
- package/build/TModelManager.js +37 -41
- package/build/TModelUtil.js +47 -50
- package/build/TUtil.js +16 -20
- package/build/TargetData.js +35 -40
- package/build/TargetExecutor.js +72 -76
- package/build/TargetManager.js +49 -52
- package/build/TargetParser.js +35 -39
- package/build/TargetUtil.js +25 -29
- package/build/Viewport.js +6 -10
- package/build/VisibilityUtil.js +11 -15
- package/build/index.js +20 -225
- package/dist/targetjs.js +1 -1
- package/dist/targetjs.js.gz +0 -0
- package/package.json +13 -7
package/build/TModelManager.js
CHANGED
|
@@ -1,15 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.TModelManager = void 0;
|
|
7
|
-
var _$Dom = require("./$Dom.js");
|
|
8
|
-
var _TUtil = require("./TUtil.js");
|
|
9
|
-
var _App = require("./App.js");
|
|
10
|
-
var _TModelUtil = require("./TModelUtil.js");
|
|
11
|
-
var _TargetUtil = require("./TargetUtil.js");
|
|
12
|
-
var _AnimationUtil = require("./AnimationUtil.js");
|
|
13
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
14
2
|
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
15
3
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
@@ -26,11 +14,18 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
|
|
|
26
14
|
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
27
15
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
28
16
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
17
|
+
import { $Dom } from "./$Dom.js";
|
|
18
|
+
import { TUtil } from "./TUtil.js";
|
|
19
|
+
import { getLocationManager, getEvents, getTargetManager, tRoot } from "./App.js";
|
|
20
|
+
import { TModelUtil } from "./TModelUtil.js";
|
|
21
|
+
import { TargetUtil } from "./TargetUtil.js";
|
|
22
|
+
import { AnimationUtil } from "./AnimationUtil.js";
|
|
23
|
+
|
|
29
24
|
/**
|
|
30
25
|
* It analyzes all objects and based on their needs, creates or removes DOM elements, restyles objects, and rerenders them.
|
|
31
26
|
* It plays a crucial role in the TargetJ process cycle.
|
|
32
27
|
*/
|
|
33
|
-
var TModelManager =
|
|
28
|
+
var TModelManager = /*#__PURE__*/function () {
|
|
34
29
|
function TModelManager() {
|
|
35
30
|
_classCallCheck(this, TModelManager);
|
|
36
31
|
this.init();
|
|
@@ -90,7 +85,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
90
85
|
var lastPreservedMap = _objectSpread({}, this.preservedDomMap);
|
|
91
86
|
this.clearFrameLists();
|
|
92
87
|
var activated = [];
|
|
93
|
-
var _iterator = _createForOfIteratorHelper(
|
|
88
|
+
var _iterator = _createForOfIteratorHelper(getLocationManager().hasLocationList),
|
|
94
89
|
_step;
|
|
95
90
|
try {
|
|
96
91
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
@@ -208,15 +203,15 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
208
203
|
if (!tmodel.isIncluded()) {
|
|
209
204
|
return false;
|
|
210
205
|
}
|
|
211
|
-
if (!tmodel.isVisible() &&
|
|
206
|
+
if (!tmodel.isVisible() && TUtil.isDefined(tmodel.targets.isVisible)) {
|
|
212
207
|
return false;
|
|
213
208
|
}
|
|
214
209
|
var parent = tmodel.parent;
|
|
215
|
-
while (parent && parent !==
|
|
216
|
-
if (
|
|
210
|
+
while (parent && parent !== tRoot()) {
|
|
211
|
+
if (TUtil.isDefined(parent.targets.canDeleteDom)) {
|
|
217
212
|
return parent.val('canDeleteDom') === false;
|
|
218
213
|
}
|
|
219
|
-
if (
|
|
214
|
+
if (TUtil.isDefined(parent.targets.isVisible)) {
|
|
220
215
|
return parent.val('isVisible') === true;
|
|
221
216
|
}
|
|
222
217
|
parent = parent.parent;
|
|
@@ -277,7 +272,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
277
272
|
}, {
|
|
278
273
|
key: "needsRelocation",
|
|
279
274
|
value: function needsRelocation(tmodel) {
|
|
280
|
-
if (tmodel.hasDom() &&
|
|
275
|
+
if (tmodel.hasDom() && TUtil.isDefined(tmodel.domOrderIndex)) {
|
|
281
276
|
return true;
|
|
282
277
|
}
|
|
283
278
|
return false;
|
|
@@ -286,7 +281,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
286
281
|
key: "needsRerender",
|
|
287
282
|
value: function needsRerender(tmodel) {
|
|
288
283
|
var html = tmodel.getHtml();
|
|
289
|
-
if (!tmodel.hasDom() || !
|
|
284
|
+
if (!tmodel.hasDom() || !TUtil.isDefined(html)) {
|
|
290
285
|
return false;
|
|
291
286
|
}
|
|
292
287
|
return tmodel.$dom.innerHTML() !== String(html) || tmodel.$dom.textOnly !== tmodel.isTextOnly();
|
|
@@ -347,9 +342,9 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
347
342
|
}
|
|
348
343
|
domParent.$dom.removeElement(tmodel.$dom.element);
|
|
349
344
|
if (changed) {
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
345
|
+
TModelUtil.createDom(tmodel);
|
|
346
|
+
TModelUtil.patchDom(tmodel);
|
|
347
|
+
TModelUtil.initStyleMaps(tmodel);
|
|
353
348
|
if (this.needsRestyle(tmodel)) {
|
|
354
349
|
this.lists.restyle.push(tmodel);
|
|
355
350
|
}
|
|
@@ -426,7 +421,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
426
421
|
key: "deleteDom",
|
|
427
422
|
value: function deleteDom(tmodel) {
|
|
428
423
|
if (tmodel.hasAnimatingTargets()) {
|
|
429
|
-
|
|
424
|
+
AnimationUtil.detachAnimationsOnDeleteDom(tmodel);
|
|
430
425
|
}
|
|
431
426
|
var domParent = tmodel.getDomParent();
|
|
432
427
|
if (domParent && domParent.$dom) {
|
|
@@ -443,7 +438,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
443
438
|
for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
|
|
444
439
|
var tmodel = _step6.value;
|
|
445
440
|
if (tmodel.hasDom()) {
|
|
446
|
-
|
|
441
|
+
TModelUtil.fixStyle(tmodel);
|
|
447
442
|
}
|
|
448
443
|
}
|
|
449
444
|
} catch (err) {
|
|
@@ -461,7 +456,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
461
456
|
for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
|
|
462
457
|
var tmodel = _step7.value;
|
|
463
458
|
if (tmodel.hasDom()) {
|
|
464
|
-
|
|
459
|
+
TModelUtil.fixAsyncStyle(tmodel);
|
|
465
460
|
}
|
|
466
461
|
}
|
|
467
462
|
} catch (err) {
|
|
@@ -495,8 +490,8 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
495
490
|
if (pending) {
|
|
496
491
|
for (var _i2 = 0, _arr2 = _toConsumableArray(pending); _i2 < _arr2.length; _i2++) {
|
|
497
492
|
var key = _arr2[_i2];
|
|
498
|
-
|
|
499
|
-
|
|
493
|
+
TargetUtil.cleanupTarget(tmodel, key);
|
|
494
|
+
TargetUtil.shouldActivateNextTarget(tmodel, key);
|
|
500
495
|
}
|
|
501
496
|
tmodel.pendingTargets = undefined;
|
|
502
497
|
}
|
|
@@ -510,8 +505,8 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
510
505
|
if (tmodel.isTargetInLoop(_key) || tmodel.isTargetPassiveLoop(_key)) {
|
|
511
506
|
continue;
|
|
512
507
|
}
|
|
513
|
-
if (
|
|
514
|
-
|
|
508
|
+
if (TargetUtil.cleanupTarget(tmodel, _key)) {
|
|
509
|
+
TargetUtil.shouldActivateNextTarget(tmodel, _key);
|
|
515
510
|
}
|
|
516
511
|
}
|
|
517
512
|
}
|
|
@@ -531,7 +526,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
531
526
|
}
|
|
532
527
|
for (var _i4 = 0, _arr3 = _toConsumableArray(tmodel.noDomUpdatingTargets); _i4 < _arr3.length; _i4++) {
|
|
533
528
|
var key = _arr3[_i4];
|
|
534
|
-
var newStatus =
|
|
529
|
+
var newStatus = getTargetManager().calculateTargetStatus(tmodel, key);
|
|
535
530
|
tmodel.setTargetStatus(key, newStatus);
|
|
536
531
|
}
|
|
537
532
|
tmodel.noDomUpdatingTargets = undefined;
|
|
@@ -555,8 +550,8 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
555
550
|
var _tmodel2$domId;
|
|
556
551
|
var _tmodel2 = _step9.value;
|
|
557
552
|
var domId = (_tmodel2$domId = _tmodel2.domId) !== null && _tmodel2$domId !== void 0 ? _tmodel2$domId : _tmodel2.oid;
|
|
558
|
-
if (
|
|
559
|
-
_tmodel2.$dom = new
|
|
553
|
+
if ($Dom.query("#".concat(domId))) {
|
|
554
|
+
_tmodel2.$dom = new $Dom("#".concat(domId));
|
|
560
555
|
_tmodel2.$dom.attr('tgjs', 'true');
|
|
561
556
|
_tmodel2.hasDomNow = true;
|
|
562
557
|
_tmodel2.markLayoutDirty('hasDomNow');
|
|
@@ -592,14 +587,14 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
592
587
|
domHolder.appendTModel$Dom(tmodel);
|
|
593
588
|
}
|
|
594
589
|
} else {
|
|
595
|
-
|
|
596
|
-
|
|
590
|
+
TModelUtil.createDom(tmodel);
|
|
591
|
+
TModelUtil.patchDom(tmodel);
|
|
597
592
|
styleBatch.push(tmodel);
|
|
598
593
|
var entry = holdersMap.get(domHolder);
|
|
599
594
|
if (!entry) {
|
|
600
595
|
entry = {
|
|
601
596
|
domHolder: domHolder,
|
|
602
|
-
fragment:
|
|
597
|
+
fragment: $Dom.createDocumentFragment(),
|
|
603
598
|
tmodels: []
|
|
604
599
|
};
|
|
605
600
|
holdersMap.set(domHolder, entry);
|
|
@@ -640,15 +635,16 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
|
|
|
640
635
|
_tmodel.hasDomNow = true;
|
|
641
636
|
_tmodel.markLayoutDirty('hasDomNow');
|
|
642
637
|
}
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
638
|
+
TModelUtil.initStyleMaps(_tmodel);
|
|
639
|
+
TModelUtil.fixStyle(_tmodel);
|
|
640
|
+
TModelUtil.fixAsyncStyle(_tmodel);
|
|
646
641
|
}
|
|
647
642
|
this.activatePendingTargetsAfterDom(this.lists.noDom);
|
|
648
|
-
|
|
643
|
+
getEvents().attachEvents(this.lists.noDom.filter(function (t) {
|
|
649
644
|
var _t$externalEventMap;
|
|
650
645
|
return ((_t$externalEventMap = t.externalEventMap) === null || _t$externalEventMap === void 0 ? void 0 : _t$externalEventMap.size) > 0;
|
|
651
646
|
}));
|
|
652
647
|
}
|
|
653
648
|
}]);
|
|
654
|
-
}();
|
|
649
|
+
}();
|
|
650
|
+
export { TModelManager };
|
package/build/TModelUtil.js
CHANGED
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.TModelUtil = void 0;
|
|
7
|
-
var _TUtil = require("./TUtil.js");
|
|
8
|
-
var _TargetUtil = require("./TargetUtil.js");
|
|
9
|
-
var _TargetData = require("./TargetData.js");
|
|
10
|
-
var _App = require("./App.js");
|
|
11
|
-
var _$Dom = require("./$Dom.js");
|
|
12
|
-
var _ColorUtil = require("./ColorUtil.js");
|
|
13
|
-
var _Easing = require("./Easing.js");
|
|
14
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
15
2
|
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
16
3
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
@@ -23,11 +10,20 @@ function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Can
|
|
|
23
10
|
function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
|
|
24
11
|
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
25
12
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
26
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
13
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
14
|
+
// TModelUtil.js
|
|
15
|
+
import { TUtil } from "./TUtil.js";
|
|
16
|
+
import { TargetUtil } from "./TargetUtil.js";
|
|
17
|
+
import { TargetData } from "./TargetData.js";
|
|
18
|
+
import { getRunScheduler, getManager } from "./App.js";
|
|
19
|
+
import { $Dom } from "./$Dom.js";
|
|
20
|
+
import { ColorUtil } from "./ColorUtil.js";
|
|
21
|
+
import { Easing } from "./Easing.js";
|
|
22
|
+
|
|
27
23
|
/**
|
|
28
24
|
* It provides helper functions for TModel.
|
|
29
25
|
*/
|
|
30
|
-
var TModelUtil =
|
|
26
|
+
var TModelUtil = /*#__PURE__*/function () {
|
|
31
27
|
function TModelUtil() {
|
|
32
28
|
_classCallCheck(this, TModelUtil);
|
|
33
29
|
}
|
|
@@ -37,7 +33,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
37
33
|
if (tmodel.val('heightFromDom') === false) {
|
|
38
34
|
return false;
|
|
39
35
|
}
|
|
40
|
-
return !tmodel.excludeDefaultStyling() && !
|
|
36
|
+
return !tmodel.excludeDefaultStyling() && !TUtil.isDefined(tmodel.targetValues.height) && !tmodel.val('heightFromDom') && !TModelUtil.isHeightDefined(tmodel) && !tmodel.hasChildren() || tmodel.val('heightFromDom');
|
|
41
37
|
}
|
|
42
38
|
}, {
|
|
43
39
|
key: "shouldMeasureWidthFromDom",
|
|
@@ -45,19 +41,19 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
45
41
|
if (tmodel.val('widthFromDom') === false) {
|
|
46
42
|
return false;
|
|
47
43
|
}
|
|
48
|
-
return !tmodel.excludeDefaultStyling() && !tmodel.reuseDomDefinition() && !tmodel.val('widthFromDom') && !
|
|
44
|
+
return !tmodel.excludeDefaultStyling() && !tmodel.reuseDomDefinition() && !tmodel.val('widthFromDom') && !TUtil.isDefined(tmodel.targetValues.width) && !TModelUtil.isWidthDefined(tmodel) && !tmodel.hasChildren() || tmodel.val('widthFromDom');
|
|
49
45
|
}
|
|
50
46
|
}, {
|
|
51
47
|
key: "isHeightDefined",
|
|
52
48
|
value: function isHeightDefined(tmodel) {
|
|
53
49
|
var _tmodel$targets$style;
|
|
54
|
-
return tmodel.isTargetImperative('height') || !!tmodel.allTargetMap['height'] || !!tmodel.allTargetMap['dim'] ||
|
|
50
|
+
return tmodel.isTargetImperative('height') || !!tmodel.allTargetMap['height'] || !!tmodel.allTargetMap['dim'] || TUtil.isDefined((_tmodel$targets$style = tmodel.targets.style) === null || _tmodel$targets$style === void 0 ? void 0 : _tmodel$targets$style.height);
|
|
55
51
|
}
|
|
56
52
|
}, {
|
|
57
53
|
key: "isWidthDefined",
|
|
58
54
|
value: function isWidthDefined(tmodel) {
|
|
59
55
|
var _tmodel$targets$style2;
|
|
60
|
-
return tmodel.isTargetImperative('width') || !!tmodel.allTargetMap['width'] || !!tmodel.allTargetMap['dim'] ||
|
|
56
|
+
return tmodel.isTargetImperative('width') || !!tmodel.allTargetMap['width'] || !!tmodel.allTargetMap['dim'] || TUtil.isDefined((_tmodel$targets$style2 = tmodel.targets.style) === null || _tmodel$targets$style2 === void 0 ? void 0 : _tmodel$targets$style2.width);
|
|
61
57
|
}
|
|
62
58
|
}, {
|
|
63
59
|
key: "isXDefined",
|
|
@@ -82,7 +78,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
82
78
|
}, {
|
|
83
79
|
key: "createDom",
|
|
84
80
|
value: function createDom(tmodel) {
|
|
85
|
-
tmodel.$dom = new
|
|
81
|
+
tmodel.$dom = new $Dom();
|
|
86
82
|
tmodel.$dom.create(tmodel.getBaseElement());
|
|
87
83
|
}
|
|
88
84
|
}, {
|
|
@@ -108,7 +104,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
108
104
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
109
105
|
var _step$value = _slicedToArray(_step.value, 1),
|
|
110
106
|
key = _step$value[0];
|
|
111
|
-
if (
|
|
107
|
+
if (TUtil.isDefined(tmodel.val(key))) {
|
|
112
108
|
tmodel.addToStyleTargetList(key);
|
|
113
109
|
}
|
|
114
110
|
}
|
|
@@ -126,8 +122,8 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
126
122
|
value = Math.floor(tmodel.getX());
|
|
127
123
|
} else if (key === 'y') {
|
|
128
124
|
value = Math.floor(tmodel.getY());
|
|
129
|
-
} else if (
|
|
130
|
-
value =
|
|
125
|
+
} else if (TargetData.transformMap[key]) {
|
|
126
|
+
value = TargetData.rotate3D[key] ? tmodel.val(key) : TargetData.scaleMap[key] ? TUtil.formatNum(tmodel.val(key), 2) : tmodel.floorVal(key);
|
|
131
127
|
}
|
|
132
128
|
return value;
|
|
133
129
|
}
|
|
@@ -147,7 +143,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
147
143
|
if (tmodel.isKeyAnimating(key)) {
|
|
148
144
|
continue;
|
|
149
145
|
}
|
|
150
|
-
if (
|
|
146
|
+
if (TargetData.transformMap[key]) {
|
|
151
147
|
var value = TModelUtil.getTransformValue(tmodel, key);
|
|
152
148
|
if (tmodel.tfMap[key] !== value) {
|
|
153
149
|
tmodel.tfMap[key] = value;
|
|
@@ -175,13 +171,13 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
175
171
|
tmodel.styleMap['height'] = height;
|
|
176
172
|
tmodel.$dom.height(height);
|
|
177
173
|
}
|
|
178
|
-
} else if (
|
|
179
|
-
if (
|
|
180
|
-
tmodel.$dom.style(key,
|
|
174
|
+
} else if (TargetData.styleWithUnitMap[key]) {
|
|
175
|
+
if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
|
|
176
|
+
tmodel.$dom.style(key, TUtil.isNumber(tmodel.val(key)) ? "".concat(tmodel.val(key), "px") : tmodel.val(key));
|
|
181
177
|
tmodel.styleMap[key] = tmodel.val(key);
|
|
182
178
|
}
|
|
183
179
|
} else {
|
|
184
|
-
if (
|
|
180
|
+
if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
|
|
185
181
|
tmodel.$dom.style(key, "".concat(tmodel.val(key)));
|
|
186
182
|
tmodel.styleMap[key] = tmodel.val(key);
|
|
187
183
|
}
|
|
@@ -204,7 +200,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
204
200
|
var parent = child.getParent();
|
|
205
201
|
var domParent = child.getDomParent();
|
|
206
202
|
var rerender = false;
|
|
207
|
-
if (
|
|
203
|
+
if (getManager().needsRerender(child)) {
|
|
208
204
|
child.isTextOnly() ? child.$dom.text(child.getHtml()) : child.$dom.html(child.getHtml());
|
|
209
205
|
rerender = true;
|
|
210
206
|
}
|
|
@@ -212,13 +208,13 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
212
208
|
child.$dom.width('auto');
|
|
213
209
|
var width = child.$dom.width();
|
|
214
210
|
width = width > 0 && child.getHtml() ? width + 1 : width;
|
|
215
|
-
child.domWidthTimestamp =
|
|
211
|
+
child.domWidthTimestamp = TUtil.now();
|
|
216
212
|
child.val('width', width);
|
|
217
213
|
if (width > 0 || width === 0 && child.lastVal('width') > 0) {
|
|
218
214
|
child.addToStyleTargetList('width');
|
|
219
215
|
}
|
|
220
216
|
child.markLayoutDirty('width');
|
|
221
|
-
|
|
217
|
+
getRunScheduler().schedule(15, 'resize');
|
|
222
218
|
}
|
|
223
219
|
}
|
|
224
220
|
}, {
|
|
@@ -228,36 +224,36 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
228
224
|
var parent = child.getParent();
|
|
229
225
|
var domParent = child.getDomParent();
|
|
230
226
|
var rerender = false;
|
|
231
|
-
if (
|
|
227
|
+
if (getManager().needsRerender(child)) {
|
|
232
228
|
child.isTextOnly() ? child.$dom.text(child.getHtml()) : child.$dom.html(child.getHtml());
|
|
233
229
|
rerender = true;
|
|
234
230
|
}
|
|
235
231
|
if (rerender || parent && timestamp <= parent.getDimLastUpdate() || domParent && timestamp <= domParent.getDimLastUpdate()) {
|
|
236
232
|
child.$dom.height('auto');
|
|
237
233
|
var height = child.$dom.height();
|
|
238
|
-
child.domHeightTimestamp =
|
|
234
|
+
child.domHeightTimestamp = TUtil.now();
|
|
239
235
|
child.val('height', height);
|
|
240
236
|
if (height > 0 || height === 0 && child.lastVal('height') > 0) {
|
|
241
237
|
child.addToStyleTargetList('height');
|
|
242
238
|
}
|
|
243
239
|
child.markLayoutDirty('height');
|
|
244
|
-
|
|
240
|
+
getRunScheduler().schedule(15, 'resize');
|
|
245
241
|
}
|
|
246
242
|
}
|
|
247
243
|
}, {
|
|
248
244
|
key: "easingMorph",
|
|
249
245
|
value: function easingMorph(tmodel, key, from, to, step, steps) {
|
|
250
246
|
var easingName = tmodel.getTargetEasing(key);
|
|
251
|
-
var easing = easingName ?
|
|
247
|
+
var easing = easingName ? Easing.easingFunction(easingName) : undefined;
|
|
252
248
|
var easingStep = easing ? easing(tmodel.getTargetStepPercent(key, step, steps)) : tmodel.getTargetStepPercent(key, step, steps);
|
|
253
249
|
return TModelUtil.morph(key, from, to, easingStep);
|
|
254
250
|
}
|
|
255
251
|
}, {
|
|
256
252
|
key: "morph",
|
|
257
253
|
value: function morph(key, from, to, easingStep) {
|
|
258
|
-
if (
|
|
259
|
-
var targetColors =
|
|
260
|
-
var lastColors = from ?
|
|
254
|
+
if (TargetData.colorMap[TargetUtil.getTargetName(key)]) {
|
|
255
|
+
var targetColors = ColorUtil.color2Integers(to);
|
|
256
|
+
var lastColors = from ? ColorUtil.color2Integers(from) : ColorUtil.color2Integers('#fff');
|
|
261
257
|
if (targetColors && lastColors) {
|
|
262
258
|
var red = Math.floor(targetColors[0] * easingStep + lastColors[0] * (1 - easingStep));
|
|
263
259
|
var green = Math.floor(targetColors[1] * easingStep + lastColors[1] * (1 - easingStep));
|
|
@@ -284,7 +280,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
284
280
|
key = _step3$value[0];
|
|
285
281
|
if (key === 'style') {
|
|
286
282
|
var style = tmodel.getStyle();
|
|
287
|
-
if (
|
|
283
|
+
if (TUtil.isDefined(style) && tmodel.styleMap.style !== style) {
|
|
288
284
|
tmodel.$dom.setStyleByMap(style);
|
|
289
285
|
if (style.height) {
|
|
290
286
|
tmodel.val('height', parseInt(style.height, 10));
|
|
@@ -296,7 +292,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
296
292
|
}
|
|
297
293
|
} else if (key === 'attributes') {
|
|
298
294
|
var attributes = tmodel.getAttributes();
|
|
299
|
-
if (
|
|
295
|
+
if (TUtil.isDefined(attributes) && tmodel.styleMap.attributes !== attributes) {
|
|
300
296
|
Object.keys(attributes).forEach(function (k) {
|
|
301
297
|
tmodel.$dom.attr(k, attributes[k]);
|
|
302
298
|
});
|
|
@@ -307,10 +303,10 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
307
303
|
if (tmodel.$dom.css() !== css) {
|
|
308
304
|
tmodel.$dom.css(css);
|
|
309
305
|
}
|
|
310
|
-
} else if (
|
|
306
|
+
} else if (TargetData.attributeTargetMap[key]) {
|
|
311
307
|
tmodel.$dom.attr(key, tmodel.val(key));
|
|
312
308
|
} else {
|
|
313
|
-
if (
|
|
309
|
+
if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
|
|
314
310
|
tmodel.$dom.style(key, "".concat(tmodel.val(key)));
|
|
315
311
|
tmodel.styleMap[key] = tmodel.val(key);
|
|
316
312
|
}
|
|
@@ -330,11 +326,11 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
330
326
|
key: "getTransformBaseFromActualValues",
|
|
331
327
|
value: function getTransformBaseFromActualValues(tmodel) {
|
|
332
328
|
var base = {};
|
|
333
|
-
var transformMap =
|
|
329
|
+
var transformMap = TargetData.transformMap;
|
|
334
330
|
for (var key in tmodel.actualValues) {
|
|
335
331
|
if (transformMap[key]) {
|
|
336
332
|
var val = tmodel.actualValues[key];
|
|
337
|
-
if (
|
|
333
|
+
if (TUtil.isDefined(val)) {
|
|
338
334
|
base[key] = val;
|
|
339
335
|
}
|
|
340
336
|
}
|
|
@@ -513,7 +509,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
513
509
|
value: function getTransformString(tmodel, values) {
|
|
514
510
|
var processed = {};
|
|
515
511
|
var transformMap = {};
|
|
516
|
-
var hasExplicitTranslate =
|
|
512
|
+
var hasExplicitTranslate = TUtil.isDefined(values.translateX) || TUtil.isDefined(values.translateY) || TUtil.isDefined(values.translateZ);
|
|
517
513
|
var keys = Object.keys(values);
|
|
518
514
|
for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
|
|
519
515
|
var key = _keys[_i];
|
|
@@ -553,7 +549,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
553
549
|
case 'rotate3DZ':
|
|
554
550
|
case 'rotate3DAngle':
|
|
555
551
|
{
|
|
556
|
-
var has3D =
|
|
552
|
+
var has3D = TUtil.isDefined(values.rotate3DX) && TUtil.isDefined(values.rotate3DY) && TUtil.isDefined(values.rotate3DZ) && TUtil.isDefined(values.rotate3DAngle);
|
|
557
553
|
if (has3D) {
|
|
558
554
|
transformMap['rotate3d'] = "rotate3d(".concat(TModelUtil.num(values.rotate3DX, 0), ", ").concat(TModelUtil.num(values.rotate3DY, 0), ", ").concat(TModelUtil.num(values.rotate3DZ, 0), ", ").concat(TModelUtil.num(values.rotate3DAngle, 0), "deg)");
|
|
559
555
|
processed.rotate3DX = processed.rotate3DY = processed.rotate3DZ = processed.rotate3DAngle = true;
|
|
@@ -571,7 +567,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
571
567
|
case 'scale3DY':
|
|
572
568
|
case 'scale3DZ':
|
|
573
569
|
{
|
|
574
|
-
var _has3D =
|
|
570
|
+
var _has3D = TUtil.isDefined(values.scale3DX) && TUtil.isDefined(values.scale3DY) && TUtil.isDefined(values.scale3DZ);
|
|
575
571
|
if (_has3D) {
|
|
576
572
|
var _values$scale3DX, _values$scale3DY, _values$scale3DZ;
|
|
577
573
|
transformMap['scale3d'] = "scale3d(".concat(Number((_values$scale3DX = values.scale3DX) !== null && _values$scale3DX !== void 0 ? _values$scale3DX : 1), ", ").concat(Number((_values$scale3DY = values.scale3DY) !== null && _values$scale3DY !== void 0 ? _values$scale3DY : 1), ", ").concat(Number((_values$scale3DZ = values.scale3DZ) !== null && _values$scale3DZ !== void 0 ? _values$scale3DZ : 1), ")");
|
|
@@ -585,7 +581,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
585
581
|
case 'skewX':
|
|
586
582
|
case 'skewY':
|
|
587
583
|
{
|
|
588
|
-
var hasBoth =
|
|
584
|
+
var hasBoth = TUtil.isDefined(values.skewX) && TUtil.isDefined(values.skewY);
|
|
589
585
|
if (hasBoth) {
|
|
590
586
|
var _values$skewX, _values$skewY;
|
|
591
587
|
transformMap['skew'] = "skew(".concat(Number((_values$skewX = values.skewX) !== null && _values$skewX !== void 0 ? _values$skewX : 0), "deg, ").concat(Number((_values$skewY = values.skewY) !== null && _values$skewY !== void 0 ? _values$skewY : 0), "deg)");
|
|
@@ -619,7 +615,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
619
615
|
}
|
|
620
616
|
}
|
|
621
617
|
if (!Object.keys(orderMap).length) {
|
|
622
|
-
orderMap =
|
|
618
|
+
orderMap = TargetData.transformOrder;
|
|
623
619
|
}
|
|
624
620
|
var sortedKeys = Object.keys(transformMap).sort(function (a, b) {
|
|
625
621
|
var _orderMap$a, _orderMap$b;
|
|
@@ -648,4 +644,5 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
648
644
|
}
|
|
649
645
|
}
|
|
650
646
|
}]);
|
|
651
|
-
}();
|
|
647
|
+
}();
|
|
648
|
+
export { TModelUtil };
|
package/build/TUtil.js
CHANGED
|
@@ -1,13 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.TUtil = void 0;
|
|
7
|
-
var _App = require("./App.js");
|
|
8
|
-
var _TargetUtil = require("./TargetUtil.js");
|
|
9
|
-
var _TargetData = require("./TargetData.js");
|
|
10
|
-
var _TModel = require("./TModel.js");
|
|
11
1
|
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
|
|
12
2
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
13
3
|
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
@@ -21,11 +11,16 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
|
|
|
21
11
|
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
22
12
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
23
13
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
14
|
+
import { getLocationManager, tRoot, getEvents } from "./App.js";
|
|
15
|
+
import { TargetUtil } from "./TargetUtil.js";
|
|
16
|
+
import { TargetData } from "./TargetData.js";
|
|
17
|
+
import { TModel } from "./TModel.js";
|
|
18
|
+
|
|
24
19
|
/**
|
|
25
20
|
*
|
|
26
21
|
* It provides a variety of helping functions that are used by the framework.
|
|
27
22
|
*/
|
|
28
|
-
var TUtil =
|
|
23
|
+
var TUtil = /*#__PURE__*/function () {
|
|
29
24
|
function TUtil() {
|
|
30
25
|
_classCallCheck(this, TUtil);
|
|
31
26
|
}
|
|
@@ -167,9 +162,9 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
|
|
|
167
162
|
}, {
|
|
168
163
|
key: "logTree",
|
|
169
164
|
value: function logTree() {
|
|
170
|
-
var tmodel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] :
|
|
165
|
+
var tmodel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : tRoot();
|
|
171
166
|
var tab = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
|
172
|
-
var list =
|
|
167
|
+
var list = getLocationManager().calcChildren(tmodel);
|
|
173
168
|
var _iterator = _createForOfIteratorHelper(list),
|
|
174
169
|
_step;
|
|
175
170
|
try {
|
|
@@ -203,7 +198,7 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
|
|
|
203
198
|
for (var i = 1; i < branch.length; i++) {
|
|
204
199
|
var parent = branch[i - 1];
|
|
205
200
|
var child = branch[i];
|
|
206
|
-
if (
|
|
201
|
+
if (getLocationManager().getChildren(parent).indexOf(child) < 0) {
|
|
207
202
|
console.log("branch is not valid: " + parent.oid + ", " + child.oid);
|
|
208
203
|
break;
|
|
209
204
|
}
|
|
@@ -217,7 +212,7 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
|
|
|
217
212
|
value: function handleValueChange(tmodel, key) {
|
|
218
213
|
var target = tmodel.targets[key];
|
|
219
214
|
if (!target) {
|
|
220
|
-
key =
|
|
215
|
+
key = TargetUtil.getTargetName(key);
|
|
221
216
|
target = tmodel.targets[key];
|
|
222
217
|
}
|
|
223
218
|
var newValue = tmodel.val(key);
|
|
@@ -235,10 +230,10 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
|
|
|
235
230
|
}, {
|
|
236
231
|
key: "runTargetValue",
|
|
237
232
|
value: function runTargetValue(tmodel, target, key, cycle, lastValue) {
|
|
238
|
-
var cleanKey =
|
|
239
|
-
var isExternalEvent =
|
|
233
|
+
var cleanKey = TargetUtil.getTargetName(key);
|
|
234
|
+
var isExternalEvent = TargetData.allEventMap[cleanKey];
|
|
240
235
|
if (isExternalEvent) {
|
|
241
|
-
return typeof target.value === 'function' ? target.value.call(tmodel,
|
|
236
|
+
return typeof target.value === 'function' ? target.value.call(tmodel, getEvents().getCurrentOriginalEvent(), cycle, lastValue) : TUtil.isDefined(target.value) ? target.value : target;
|
|
242
237
|
} else if (tmodel.val("___".concat(key))) {
|
|
243
238
|
return typeof target.value === 'function' ? target.value.call(tmodel, tmodel.val("___".concat(key)), cycle, lastValue) : TUtil.isDefined(target.value) ? target.value : target;
|
|
244
239
|
} else {
|
|
@@ -279,7 +274,7 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
|
|
|
279
274
|
}
|
|
280
275
|
|
|
281
276
|
// Avoid cloning DOM wrappers, real DOM nodes, TModels, etc.
|
|
282
|
-
if (value instanceof
|
|
277
|
+
if (value instanceof TModel || value instanceof Element || value instanceof Node || value instanceof Date || value instanceof RegExp) {
|
|
283
278
|
return value;
|
|
284
279
|
}
|
|
285
280
|
if (seen.has(value)) {
|
|
@@ -458,4 +453,5 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
|
|
|
458
453
|
};
|
|
459
454
|
}
|
|
460
455
|
}]);
|
|
461
|
-
}();
|
|
456
|
+
}();
|
|
457
|
+
export { TUtil };
|