targetj 1.0.240 → 1.0.242
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 +27 -5
- package/README.md +108 -68
- package/build/$Dom.js +21 -25
- package/build/AnimationManager.js +40 -45
- package/build/AnimationUtil.js +41 -45
- package/build/App.js +73 -74
- package/build/BaseModel.js +86 -90
- package/build/Bracket.js +7 -21
- 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 +66 -75
- 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 +72 -73
- package/build/ScheduleUtil.js +20 -24
- package/build/SearchUtil.js +16 -20
- package/build/TModel.js +159 -99
- package/build/TModelManager.js +37 -41
- package/build/TModelUtil.js +122 -53
- package/build/TUtil.js +16 -20
- package/build/TargetData.js +40 -45
- package/build/TargetExecutor.js +72 -76
- package/build/TargetManager.js +49 -52
- package/build/TargetParser.js +35 -39
- package/build/TargetUtil.js +28 -31
- package/build/Viewport.js +24 -22
- package/build/VisibilityUtil.js +74 -70
- package/build/index.js +20 -225
- package/dist/targetjs.js +1 -1
- package/dist/targetjs.js.gz +0 -0
- package/package.json +1 -1
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,43 +1,111 @@
|
|
|
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); }
|
|
2
|
+
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; } } }; }
|
|
15
3
|
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
16
4
|
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."); }
|
|
17
|
-
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
18
|
-
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
19
|
-
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; } } }; }
|
|
20
5
|
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
21
6
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
7
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
8
|
+
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
22
9
|
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
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
|
}
|
|
34
30
|
return _createClass(TModelUtil, null, [{
|
|
31
|
+
key: "getMarginValue",
|
|
32
|
+
value: function getMarginValue(tmodel, side) {
|
|
33
|
+
var margin = tmodel.val("margin");
|
|
34
|
+
if (typeof margin === "number") {
|
|
35
|
+
return margin;
|
|
36
|
+
}
|
|
37
|
+
if (Array.isArray(margin)) {
|
|
38
|
+
if (margin.length === 2) {
|
|
39
|
+
var _margin = _slicedToArray(margin, 2),
|
|
40
|
+
vertical = _margin[0],
|
|
41
|
+
horizontal = _margin[1];
|
|
42
|
+
return side === "top" || side === "bottom" ? vertical : horizontal;
|
|
43
|
+
}
|
|
44
|
+
if (margin.length === 4) {
|
|
45
|
+
var _margin2 = _slicedToArray(margin, 4),
|
|
46
|
+
top = _margin2[0],
|
|
47
|
+
right = _margin2[1],
|
|
48
|
+
bottom = _margin2[2],
|
|
49
|
+
left = _margin2[3];
|
|
50
|
+
if (side === "top") {
|
|
51
|
+
return top;
|
|
52
|
+
}
|
|
53
|
+
if (side === "right") {
|
|
54
|
+
return right;
|
|
55
|
+
}
|
|
56
|
+
if (side === "bottom") {
|
|
57
|
+
return bottom;
|
|
58
|
+
}
|
|
59
|
+
if (side === "left") {
|
|
60
|
+
return left;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return 0;
|
|
65
|
+
}
|
|
66
|
+
}, {
|
|
67
|
+
key: "getPaddingValue",
|
|
68
|
+
value: function getPaddingValue(tmodel, side) {
|
|
69
|
+
var padding = tmodel.val("padding");
|
|
70
|
+
if (typeof padding === "number") {
|
|
71
|
+
return padding;
|
|
72
|
+
}
|
|
73
|
+
if (Array.isArray(padding)) {
|
|
74
|
+
if (padding.length === 2) {
|
|
75
|
+
var _padding = _slicedToArray(padding, 2),
|
|
76
|
+
vertical = _padding[0],
|
|
77
|
+
horizontal = _padding[1];
|
|
78
|
+
return side === "top" || side === "bottom" ? vertical : horizontal;
|
|
79
|
+
}
|
|
80
|
+
if (padding.length === 4) {
|
|
81
|
+
var _padding2 = _slicedToArray(padding, 4),
|
|
82
|
+
top = _padding2[0],
|
|
83
|
+
right = _padding2[1],
|
|
84
|
+
bottom = _padding2[2],
|
|
85
|
+
left = _padding2[3];
|
|
86
|
+
if (side === "top") {
|
|
87
|
+
return top;
|
|
88
|
+
}
|
|
89
|
+
if (side === "right") {
|
|
90
|
+
return right;
|
|
91
|
+
}
|
|
92
|
+
if (side === "bottom") {
|
|
93
|
+
return bottom;
|
|
94
|
+
}
|
|
95
|
+
if (side === "left") {
|
|
96
|
+
return left;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return 0;
|
|
101
|
+
}
|
|
102
|
+
}, {
|
|
35
103
|
key: "shouldMeasureHeightFromDom",
|
|
36
104
|
value: function shouldMeasureHeightFromDom(tmodel) {
|
|
37
105
|
if (tmodel.val('heightFromDom') === false) {
|
|
38
106
|
return false;
|
|
39
107
|
}
|
|
40
|
-
return !tmodel.excludeDefaultStyling() && !
|
|
108
|
+
return !tmodel.excludeDefaultStyling() && !TUtil.isDefined(tmodel.targetValues.height) && !tmodel.val('heightFromDom') && !TModelUtil.isHeightDefined(tmodel) && !tmodel.hasChildren() || tmodel.val('heightFromDom');
|
|
41
109
|
}
|
|
42
110
|
}, {
|
|
43
111
|
key: "shouldMeasureWidthFromDom",
|
|
@@ -45,19 +113,19 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
45
113
|
if (tmodel.val('widthFromDom') === false) {
|
|
46
114
|
return false;
|
|
47
115
|
}
|
|
48
|
-
return !tmodel.excludeDefaultStyling() && !tmodel.reuseDomDefinition() && !tmodel.val('widthFromDom') && !
|
|
116
|
+
return !tmodel.excludeDefaultStyling() && !tmodel.reuseDomDefinition() && !tmodel.val('widthFromDom') && !TUtil.isDefined(tmodel.targetValues.width) && !TModelUtil.isWidthDefined(tmodel) && !tmodel.hasChildren() || tmodel.val('widthFromDom');
|
|
49
117
|
}
|
|
50
118
|
}, {
|
|
51
119
|
key: "isHeightDefined",
|
|
52
120
|
value: function isHeightDefined(tmodel) {
|
|
53
121
|
var _tmodel$targets$style;
|
|
54
|
-
return tmodel.isTargetImperative('height') || !!tmodel.allTargetMap['height'] || !!tmodel.allTargetMap['dim'] ||
|
|
122
|
+
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
123
|
}
|
|
56
124
|
}, {
|
|
57
125
|
key: "isWidthDefined",
|
|
58
126
|
value: function isWidthDefined(tmodel) {
|
|
59
127
|
var _tmodel$targets$style2;
|
|
60
|
-
return tmodel.isTargetImperative('width') || !!tmodel.allTargetMap['width'] || !!tmodel.allTargetMap['dim'] ||
|
|
128
|
+
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
129
|
}
|
|
62
130
|
}, {
|
|
63
131
|
key: "isXDefined",
|
|
@@ -82,7 +150,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
82
150
|
}, {
|
|
83
151
|
key: "createDom",
|
|
84
152
|
value: function createDom(tmodel) {
|
|
85
|
-
tmodel.$dom = new
|
|
153
|
+
tmodel.$dom = new $Dom();
|
|
86
154
|
tmodel.$dom.create(tmodel.getBaseElement());
|
|
87
155
|
}
|
|
88
156
|
}, {
|
|
@@ -108,7 +176,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
108
176
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
109
177
|
var _step$value = _slicedToArray(_step.value, 1),
|
|
110
178
|
key = _step$value[0];
|
|
111
|
-
if (
|
|
179
|
+
if (TUtil.isDefined(tmodel.val(key))) {
|
|
112
180
|
tmodel.addToStyleTargetList(key);
|
|
113
181
|
}
|
|
114
182
|
}
|
|
@@ -126,8 +194,8 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
126
194
|
value = Math.floor(tmodel.getX());
|
|
127
195
|
} else if (key === 'y') {
|
|
128
196
|
value = Math.floor(tmodel.getY());
|
|
129
|
-
} else if (
|
|
130
|
-
value =
|
|
197
|
+
} else if (TargetData.transformMap[key]) {
|
|
198
|
+
value = TargetData.rotate3D[key] ? tmodel.val(key) : TargetData.scaleMap[key] ? TUtil.formatNum(tmodel.val(key), 2) : tmodel.floorVal(key);
|
|
131
199
|
}
|
|
132
200
|
return value;
|
|
133
201
|
}
|
|
@@ -147,7 +215,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
147
215
|
if (tmodel.isKeyAnimating(key)) {
|
|
148
216
|
continue;
|
|
149
217
|
}
|
|
150
|
-
if (
|
|
218
|
+
if (TargetData.transformMap[key]) {
|
|
151
219
|
var value = TModelUtil.getTransformValue(tmodel, key);
|
|
152
220
|
if (tmodel.tfMap[key] !== value) {
|
|
153
221
|
tmodel.tfMap[key] = value;
|
|
@@ -175,13 +243,13 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
175
243
|
tmodel.styleMap['height'] = height;
|
|
176
244
|
tmodel.$dom.height(height);
|
|
177
245
|
}
|
|
178
|
-
} else if (
|
|
179
|
-
if (
|
|
180
|
-
tmodel.$dom.style(key,
|
|
246
|
+
} else if (TargetData.styleWithUnitMap[key]) {
|
|
247
|
+
if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
|
|
248
|
+
tmodel.$dom.style(key, TUtil.isNumber(tmodel.val(key)) ? "".concat(tmodel.val(key), "px") : tmodel.val(key));
|
|
181
249
|
tmodel.styleMap[key] = tmodel.val(key);
|
|
182
250
|
}
|
|
183
251
|
} else {
|
|
184
|
-
if (
|
|
252
|
+
if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
|
|
185
253
|
tmodel.$dom.style(key, "".concat(tmodel.val(key)));
|
|
186
254
|
tmodel.styleMap[key] = tmodel.val(key);
|
|
187
255
|
}
|
|
@@ -204,7 +272,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
204
272
|
var parent = child.getParent();
|
|
205
273
|
var domParent = child.getDomParent();
|
|
206
274
|
var rerender = false;
|
|
207
|
-
if (
|
|
275
|
+
if (getManager().needsRerender(child)) {
|
|
208
276
|
child.isTextOnly() ? child.$dom.text(child.getHtml()) : child.$dom.html(child.getHtml());
|
|
209
277
|
rerender = true;
|
|
210
278
|
}
|
|
@@ -212,13 +280,13 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
212
280
|
child.$dom.width('auto');
|
|
213
281
|
var width = child.$dom.width();
|
|
214
282
|
width = width > 0 && child.getHtml() ? width + 1 : width;
|
|
215
|
-
child.domWidthTimestamp =
|
|
283
|
+
child.domWidthTimestamp = TUtil.now();
|
|
216
284
|
child.val('width', width);
|
|
217
285
|
if (width > 0 || width === 0 && child.lastVal('width') > 0) {
|
|
218
286
|
child.addToStyleTargetList('width');
|
|
219
287
|
}
|
|
220
288
|
child.markLayoutDirty('width');
|
|
221
|
-
|
|
289
|
+
getRunScheduler().schedule(15, 'resize');
|
|
222
290
|
}
|
|
223
291
|
}
|
|
224
292
|
}, {
|
|
@@ -228,36 +296,36 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
228
296
|
var parent = child.getParent();
|
|
229
297
|
var domParent = child.getDomParent();
|
|
230
298
|
var rerender = false;
|
|
231
|
-
if (
|
|
299
|
+
if (getManager().needsRerender(child)) {
|
|
232
300
|
child.isTextOnly() ? child.$dom.text(child.getHtml()) : child.$dom.html(child.getHtml());
|
|
233
301
|
rerender = true;
|
|
234
302
|
}
|
|
235
303
|
if (rerender || parent && timestamp <= parent.getDimLastUpdate() || domParent && timestamp <= domParent.getDimLastUpdate()) {
|
|
236
304
|
child.$dom.height('auto');
|
|
237
305
|
var height = child.$dom.height();
|
|
238
|
-
child.domHeightTimestamp =
|
|
306
|
+
child.domHeightTimestamp = TUtil.now();
|
|
239
307
|
child.val('height', height);
|
|
240
308
|
if (height > 0 || height === 0 && child.lastVal('height') > 0) {
|
|
241
309
|
child.addToStyleTargetList('height');
|
|
242
310
|
}
|
|
243
311
|
child.markLayoutDirty('height');
|
|
244
|
-
|
|
312
|
+
getRunScheduler().schedule(15, 'resize');
|
|
245
313
|
}
|
|
246
314
|
}
|
|
247
315
|
}, {
|
|
248
316
|
key: "easingMorph",
|
|
249
317
|
value: function easingMorph(tmodel, key, from, to, step, steps) {
|
|
250
318
|
var easingName = tmodel.getTargetEasing(key);
|
|
251
|
-
var easing = easingName ?
|
|
319
|
+
var easing = easingName ? Easing.easingFunction(easingName) : undefined;
|
|
252
320
|
var easingStep = easing ? easing(tmodel.getTargetStepPercent(key, step, steps)) : tmodel.getTargetStepPercent(key, step, steps);
|
|
253
321
|
return TModelUtil.morph(key, from, to, easingStep);
|
|
254
322
|
}
|
|
255
323
|
}, {
|
|
256
324
|
key: "morph",
|
|
257
325
|
value: function morph(key, from, to, easingStep) {
|
|
258
|
-
if (
|
|
259
|
-
var targetColors =
|
|
260
|
-
var lastColors = from ?
|
|
326
|
+
if (TargetData.colorMap[TargetUtil.getTargetName(key)]) {
|
|
327
|
+
var targetColors = ColorUtil.color2Integers(to);
|
|
328
|
+
var lastColors = from ? ColorUtil.color2Integers(from) : ColorUtil.color2Integers('#fff');
|
|
261
329
|
if (targetColors && lastColors) {
|
|
262
330
|
var red = Math.floor(targetColors[0] * easingStep + lastColors[0] * (1 - easingStep));
|
|
263
331
|
var green = Math.floor(targetColors[1] * easingStep + lastColors[1] * (1 - easingStep));
|
|
@@ -284,7 +352,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
284
352
|
key = _step3$value[0];
|
|
285
353
|
if (key === 'style') {
|
|
286
354
|
var style = tmodel.getStyle();
|
|
287
|
-
if (
|
|
355
|
+
if (TUtil.isDefined(style) && tmodel.styleMap.style !== style) {
|
|
288
356
|
tmodel.$dom.setStyleByMap(style);
|
|
289
357
|
if (style.height) {
|
|
290
358
|
tmodel.val('height', parseInt(style.height, 10));
|
|
@@ -296,7 +364,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
296
364
|
}
|
|
297
365
|
} else if (key === 'attributes') {
|
|
298
366
|
var attributes = tmodel.getAttributes();
|
|
299
|
-
if (
|
|
367
|
+
if (TUtil.isDefined(attributes) && tmodel.styleMap.attributes !== attributes) {
|
|
300
368
|
Object.keys(attributes).forEach(function (k) {
|
|
301
369
|
tmodel.$dom.attr(k, attributes[k]);
|
|
302
370
|
});
|
|
@@ -307,10 +375,10 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
307
375
|
if (tmodel.$dom.css() !== css) {
|
|
308
376
|
tmodel.$dom.css(css);
|
|
309
377
|
}
|
|
310
|
-
} else if (
|
|
378
|
+
} else if (TargetData.attributeTargetMap[key]) {
|
|
311
379
|
tmodel.$dom.attr(key, tmodel.val(key));
|
|
312
380
|
} else {
|
|
313
|
-
if (
|
|
381
|
+
if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
|
|
314
382
|
tmodel.$dom.style(key, "".concat(tmodel.val(key)));
|
|
315
383
|
tmodel.styleMap[key] = tmodel.val(key);
|
|
316
384
|
}
|
|
@@ -330,11 +398,11 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
330
398
|
key: "getTransformBaseFromActualValues",
|
|
331
399
|
value: function getTransformBaseFromActualValues(tmodel) {
|
|
332
400
|
var base = {};
|
|
333
|
-
var transformMap =
|
|
401
|
+
var transformMap = TargetData.transformMap;
|
|
334
402
|
for (var key in tmodel.actualValues) {
|
|
335
403
|
if (transformMap[key]) {
|
|
336
404
|
var val = tmodel.actualValues[key];
|
|
337
|
-
if (
|
|
405
|
+
if (TUtil.isDefined(val)) {
|
|
338
406
|
base[key] = val;
|
|
339
407
|
}
|
|
340
408
|
}
|
|
@@ -513,7 +581,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
513
581
|
value: function getTransformString(tmodel, values) {
|
|
514
582
|
var processed = {};
|
|
515
583
|
var transformMap = {};
|
|
516
|
-
var hasExplicitTranslate =
|
|
584
|
+
var hasExplicitTranslate = TUtil.isDefined(values.translateX) || TUtil.isDefined(values.translateY) || TUtil.isDefined(values.translateZ);
|
|
517
585
|
var keys = Object.keys(values);
|
|
518
586
|
for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
|
|
519
587
|
var key = _keys[_i];
|
|
@@ -553,7 +621,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
553
621
|
case 'rotate3DZ':
|
|
554
622
|
case 'rotate3DAngle':
|
|
555
623
|
{
|
|
556
|
-
var has3D =
|
|
624
|
+
var has3D = TUtil.isDefined(values.rotate3DX) && TUtil.isDefined(values.rotate3DY) && TUtil.isDefined(values.rotate3DZ) && TUtil.isDefined(values.rotate3DAngle);
|
|
557
625
|
if (has3D) {
|
|
558
626
|
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
627
|
processed.rotate3DX = processed.rotate3DY = processed.rotate3DZ = processed.rotate3DAngle = true;
|
|
@@ -571,7 +639,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
571
639
|
case 'scale3DY':
|
|
572
640
|
case 'scale3DZ':
|
|
573
641
|
{
|
|
574
|
-
var _has3D =
|
|
642
|
+
var _has3D = TUtil.isDefined(values.scale3DX) && TUtil.isDefined(values.scale3DY) && TUtil.isDefined(values.scale3DZ);
|
|
575
643
|
if (_has3D) {
|
|
576
644
|
var _values$scale3DX, _values$scale3DY, _values$scale3DZ;
|
|
577
645
|
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 +653,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
585
653
|
case 'skewX':
|
|
586
654
|
case 'skewY':
|
|
587
655
|
{
|
|
588
|
-
var hasBoth =
|
|
656
|
+
var hasBoth = TUtil.isDefined(values.skewX) && TUtil.isDefined(values.skewY);
|
|
589
657
|
if (hasBoth) {
|
|
590
658
|
var _values$skewX, _values$skewY;
|
|
591
659
|
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 +687,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
619
687
|
}
|
|
620
688
|
}
|
|
621
689
|
if (!Object.keys(orderMap).length) {
|
|
622
|
-
orderMap =
|
|
690
|
+
orderMap = TargetData.transformOrder;
|
|
623
691
|
}
|
|
624
692
|
var sortedKeys = Object.keys(transformMap).sort(function (a, b) {
|
|
625
693
|
var _orderMap$a, _orderMap$b;
|
|
@@ -648,4 +716,5 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
|
|
|
648
716
|
}
|
|
649
717
|
}
|
|
650
718
|
}]);
|
|
651
|
-
}();
|
|
719
|
+
}();
|
|
720
|
+
export { TModelUtil };
|