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/TargetData.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.TargetData = void 0;
|
|
7
|
-
var _App = require("./App.js");
|
|
8
|
-
var _TUtil = require("./TUtil.js");
|
|
9
|
-
var _TargetUtil = require("./TargetUtil.js");
|
|
10
1
|
var _TargetData;
|
|
11
2
|
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
12
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."); }
|
|
@@ -23,7 +14,10 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
|
|
|
23
14
|
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
24
15
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
25
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); }
|
|
26
|
-
|
|
17
|
+
import { getEvents, getResizeLastUpdate } from "./App.js";
|
|
18
|
+
import { TUtil } from "./TUtil.js";
|
|
19
|
+
import { TargetUtil } from "./TargetUtil.js";
|
|
20
|
+
var TargetData = /*#__PURE__*/function () {
|
|
27
21
|
function TargetData() {
|
|
28
22
|
_classCallCheck(this, TargetData);
|
|
29
23
|
}
|
|
@@ -71,7 +65,7 @@ var TargetData = exports.TargetData = /*#__PURE__*/function () {
|
|
|
71
65
|
}, {
|
|
72
66
|
key: "isGpuPreferred",
|
|
73
67
|
value: function isGpuPreferred(key) {
|
|
74
|
-
return !!TargetData.gpuTargetMap[
|
|
68
|
+
return !!TargetData.gpuTargetMap[TargetUtil.getTargetName(key)];
|
|
75
69
|
}
|
|
76
70
|
}, {
|
|
77
71
|
key: "isTransformKey",
|
|
@@ -826,7 +820,7 @@ _defineProperty(TargetData, "internalEventMap", {
|
|
|
826
820
|
return false;
|
|
827
821
|
}
|
|
828
822
|
var parent = tmodel.getParent();
|
|
829
|
-
var resizeLast =
|
|
823
|
+
var resizeLast = getResizeLastUpdate();
|
|
830
824
|
var parentLast = parent ? parent.getDimLastUpdate() : 0;
|
|
831
825
|
var resizeLastUpdate = parentLast > resizeLast ? parentLast : resizeLast;
|
|
832
826
|
return resizeLastUpdate > lastUpdate;
|
|
@@ -834,85 +828,85 @@ _defineProperty(TargetData, "internalEventMap", {
|
|
|
834
828
|
});
|
|
835
829
|
_defineProperty(TargetData, "allEventMap", {
|
|
836
830
|
onStart: function onStart(tmodel) {
|
|
837
|
-
return
|
|
831
|
+
return getEvents().isStartEvent() && getEvents().isStartHandler(tmodel);
|
|
838
832
|
},
|
|
839
833
|
onEnd: function onEnd(tmodel) {
|
|
840
|
-
return
|
|
834
|
+
return getEvents().isEndEvent() && getEvents().isEndHandler(tmodel);
|
|
841
835
|
},
|
|
842
836
|
onAnySwipe: function onAnySwipe() {
|
|
843
|
-
return
|
|
837
|
+
return getEvents().isSwipeEvent() && TUtil.isDefined(getEvents().swipeStartX);
|
|
844
838
|
},
|
|
845
839
|
onHover: function onHover(tmodel) {
|
|
846
|
-
return
|
|
840
|
+
return getEvents().isMoveEvent() && getEvents().isHoverHandler(tmodel);
|
|
847
841
|
},
|
|
848
842
|
onClick: function onClick(tmodel) {
|
|
849
|
-
return
|
|
843
|
+
return getEvents().isClickEvent() && getEvents().isClickHandler(tmodel);
|
|
850
844
|
},
|
|
851
845
|
onAnyClick: function onAnyClick() {
|
|
852
|
-
return
|
|
846
|
+
return getEvents().isClickEvent();
|
|
853
847
|
},
|
|
854
848
|
onEnter: function onEnter(tmodel) {
|
|
855
|
-
return
|
|
849
|
+
return getEvents().isEnterHandler(tmodel);
|
|
856
850
|
},
|
|
857
851
|
onLeave: function onLeave(tmodel) {
|
|
858
|
-
return
|
|
852
|
+
return getEvents().isLeaveHandler(tmodel);
|
|
859
853
|
},
|
|
860
854
|
onSwipe: function onSwipe(tmodel) {
|
|
861
|
-
return
|
|
855
|
+
return getEvents().isSwipeHandler(tmodel) && getEvents().isSwipeEvent() && TUtil.isDefined(getEvents().swipeStartX);
|
|
862
856
|
},
|
|
863
857
|
onFocus: function onFocus(tmodel) {
|
|
864
|
-
return
|
|
858
|
+
return getEvents().onFocus(tmodel);
|
|
865
859
|
},
|
|
866
860
|
onBlur: function onBlur(tmodel) {
|
|
867
|
-
return
|
|
861
|
+
return getEvents().onBlur(tmodel);
|
|
868
862
|
},
|
|
869
863
|
onPinch: function onPinch(tmodel) {
|
|
870
|
-
return
|
|
864
|
+
return getEvents().isPinchHandler(tmodel);
|
|
871
865
|
},
|
|
872
866
|
onKey: function onKey(tmodel) {
|
|
873
|
-
return
|
|
867
|
+
return getEvents().getEventType() === 'key' && getEvents().currentKey && getEvents().currentHandlers.focus === tmodel && getEvents().currentHandlers.justFocused !== tmodel;
|
|
874
868
|
},
|
|
875
869
|
onKeyDown: function onKeyDown(tmodel) {
|
|
876
|
-
return
|
|
870
|
+
return getEvents().getEventType() === 'keydown' && getEvents().currentKey && getEvents().currentHandlers.focus === tmodel && getEvents().currentHandlers.justFocused !== tmodel;
|
|
877
871
|
},
|
|
878
872
|
onAnyKey: function onAnyKey() {
|
|
879
|
-
return
|
|
873
|
+
return getEvents().getEventType() === 'key' && getEvents().currentKey;
|
|
880
874
|
},
|
|
881
875
|
onScroll: function onScroll(tmodel) {
|
|
882
|
-
return
|
|
876
|
+
return getEvents().isScrollLeftHandler(tmodel) && getEvents().deltaX() || getEvents().isScrollTopHandler(tmodel) && getEvents().deltaY();
|
|
883
877
|
},
|
|
884
878
|
onScrollTop: function onScrollTop(tmodel) {
|
|
885
|
-
return
|
|
879
|
+
return getEvents().getOrientation() !== 'horizontal' && getEvents().isScrollTopHandler(tmodel) && getEvents().deltaY();
|
|
886
880
|
},
|
|
887
881
|
onScrollLeft: function onScrollLeft(tmodel) {
|
|
888
|
-
return
|
|
882
|
+
return getEvents().getOrientation() !== 'vertical' && getEvents().isScrollLeftHandler(tmodel) && getEvents().deltaX();
|
|
889
883
|
},
|
|
890
884
|
onScrollTopEnd: function onScrollTopEnd(tmodel) {
|
|
891
|
-
return
|
|
885
|
+
return getEvents().getEventType() === 'scrolltopend' && getEvents().isScrollTopEndHandler(tmodel);
|
|
892
886
|
},
|
|
893
887
|
onScrollLeftEnd: function onScrollLeftEnd(tmodel) {
|
|
894
|
-
return
|
|
888
|
+
return getEvents().getEventType() === 'scrollleftend' && getEvents().isScrollLeftEndHandler(tmodel);
|
|
895
889
|
},
|
|
896
890
|
onWindowScroll: function onWindowScroll(tmodel) {
|
|
897
|
-
return
|
|
891
|
+
return getEvents().getEventType() === 'scroll' && getEvents().getEventTModel() === tmodel;
|
|
898
892
|
},
|
|
899
893
|
onWindowScrollTopEnd: function onWindowScrollTopEnd(tmodel) {
|
|
900
|
-
return
|
|
894
|
+
return getEvents().getEventType() === 'windowscrolltopend' && getEvents().getEventTModel() === tmodel;
|
|
901
895
|
},
|
|
902
896
|
onWindowScrollLeftEnd: function onWindowScrollLeftEnd(tmodel) {
|
|
903
|
-
return
|
|
897
|
+
return getEvents().getEventType() === 'windowscrollleftend' && getEvents().getEventTModel() === tmodel;
|
|
904
898
|
},
|
|
905
899
|
onPopState: function onPopState() {
|
|
906
|
-
return
|
|
900
|
+
return getEvents().getEventType() === 'popstate';
|
|
907
901
|
},
|
|
908
902
|
onChange: function onChange(tmodel) {
|
|
909
|
-
return
|
|
903
|
+
return getEvents().getEventType() === 'change' && getEvents().isFormHandler(tmodel);
|
|
910
904
|
},
|
|
911
905
|
onInput: function onInput(tmodel) {
|
|
912
|
-
return
|
|
906
|
+
return getEvents().getEventType() === 'input' && getEvents().isFormHandler(tmodel);
|
|
913
907
|
},
|
|
914
908
|
onSubmit: function onSubmit() {
|
|
915
|
-
return
|
|
909
|
+
return getEvents().getEventType() === 'submit';
|
|
916
910
|
}
|
|
917
911
|
});
|
|
918
912
|
_defineProperty(TargetData, "excludedTargetKeys", new Set(['originalTargetName', 'originalTModel', 'activateNextTarget', 'invokerTarget', 'invokerTModel', 'active', 'addChildAction', 'childAction', 'fetchAction']));
|
|
@@ -926,4 +920,5 @@ _defineProperty(TargetData, "lifecyclePatterns", {
|
|
|
926
920
|
_defineProperty(TargetData, "eventSet", new Set([].concat(_toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)))));
|
|
927
921
|
_defineProperty(TargetData, "styleSet", new Set([].concat(_toConsumableArray(Object.keys(_TargetData.styleTargetMap)), _toConsumableArray(Object.keys(_TargetData.asyncStyleTargetMap)), _toConsumableArray(Object.keys(_TargetData.attributeTargetMap)))));
|
|
928
922
|
_defineProperty(TargetData, "reservedKeywordSet", new Set([].concat(_toConsumableArray(_TargetData.styleSet), _toConsumableArray(Object.keys(_TargetData.defaultActualValues())), _toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)), _toConsumableArray(Object.keys(_TargetData.mustExecuteTargets)), ['html', 'isInFlow', 'domHolder', 'domParent', 'gap', 'widthFromDom', 'heightFromDom', 'requiresDom', 'preventDefault', 'canDeleteDom', 'textOnly', 'styling', '$dom', 'defaultStyling', 'reuseDomDefinition', 'canHaveDom', 'excludeXYCalc', 'excludeX', 'excludeY', 'containerOverflowMode', 'itemOverflowMode', 'baseElement', 'element', 'otype', 'calculateChildren', 'domIsland', 'bracketThreshold', 'bracketSize', 'shouldBeBracketed', 'sourceDom'])));
|
|
929
|
-
_defineProperty(TargetData, "activationKeywordSet", new Set(['originalTModel', 'originalTargetName', 'activateNextTarget']));
|
|
923
|
+
_defineProperty(TargetData, "activationKeywordSet", new Set(['originalTModel', 'originalTargetName', 'activateNextTarget']));
|
|
924
|
+
export { TargetData };
|
package/build/TargetExecutor.js
CHANGED
|
@@ -1,17 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.TargetExecutor = void 0;
|
|
7
|
-
var _TargetUtil = require("./TargetUtil.js");
|
|
8
|
-
var _TargetParser = require("./TargetParser.js");
|
|
9
|
-
var _TargetData = require("./TargetData.js");
|
|
10
|
-
var _TModel = require("./TModel.js");
|
|
11
|
-
var _TUtil = require("./TUtil.js");
|
|
12
|
-
var _AnimationUtil = require("./AnimationUtil.js");
|
|
13
|
-
var _Easing = require("./Easing.js");
|
|
14
|
-
var _App = require("./App.js");
|
|
15
1
|
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
16
2
|
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
3
|
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; } }
|
|
@@ -27,18 +13,27 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
|
|
|
27
13
|
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
28
14
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
29
15
|
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); }
|
|
16
|
+
import { TargetUtil } from "./TargetUtil.js";
|
|
17
|
+
import { TargetParser } from "./TargetParser.js";
|
|
18
|
+
import { TargetData } from "./TargetData.js";
|
|
19
|
+
import { TModel } from "./TModel.js";
|
|
20
|
+
import { TUtil } from "./TUtil.js";
|
|
21
|
+
import { AnimationUtil } from "./AnimationUtil.js";
|
|
22
|
+
import { Easing } from "./Easing.js";
|
|
23
|
+
import { getLoader, getRunScheduler, getAnimationManager } from "./App.js";
|
|
24
|
+
|
|
30
25
|
/**
|
|
31
26
|
* It is responsible for executing both declarative and imperative targets.
|
|
32
27
|
*/
|
|
33
|
-
var TargetExecutor =
|
|
28
|
+
var TargetExecutor = /*#__PURE__*/function () {
|
|
34
29
|
function TargetExecutor() {
|
|
35
30
|
_classCallCheck(this, TargetExecutor);
|
|
36
31
|
}
|
|
37
32
|
return _createClass(TargetExecutor, null, [{
|
|
38
33
|
key: "prepareTarget",
|
|
39
34
|
value: function prepareTarget(tmodel, key) {
|
|
40
|
-
|
|
41
|
-
|
|
35
|
+
TargetUtil.currentTargetName = key;
|
|
36
|
+
TargetUtil.currentTModel = tmodel;
|
|
42
37
|
if (tmodel.isExecuted(key)) {
|
|
43
38
|
if (tmodel.getTargetCycles(key) > 1 && tmodel.getTargetCycle(key) < tmodel.getTargetCycles(key) - 1) {
|
|
44
39
|
tmodel.incrementTargetCycle(key);
|
|
@@ -52,7 +47,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
52
47
|
}, {
|
|
53
48
|
key: "executeDeclarativeTarget",
|
|
54
49
|
value: function executeDeclarativeTarget(tmodel, key) {
|
|
55
|
-
var cleanKey =
|
|
50
|
+
var cleanKey = TargetUtil.getTargetName(key);
|
|
56
51
|
tmodel.allTargetMap[cleanKey] = key;
|
|
57
52
|
TargetExecutor.resolveTargetValue(tmodel, key);
|
|
58
53
|
TargetExecutor.updateTarget(tmodel, tmodel.targetValues[key], key, false);
|
|
@@ -61,14 +56,14 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
61
56
|
key: "assignImperativeTargetValue",
|
|
62
57
|
value: function assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel) {
|
|
63
58
|
var _tmodel$animatingMap;
|
|
64
|
-
tmodel.targetValues[key] = tmodel.targetValues[key] ||
|
|
59
|
+
tmodel.targetValues[key] = tmodel.targetValues[key] || TargetUtil.emptyValue();
|
|
65
60
|
var targetValue = tmodel.targetValues[key];
|
|
66
61
|
targetValue.isImperative = true;
|
|
67
62
|
targetValue.originalTargetName = originalTargetName;
|
|
68
63
|
targetValue.originalTModel = originalTModel;
|
|
69
64
|
var isAnimating = (_tmodel$animatingMap = tmodel.animatingMap) === null || _tmodel$animatingMap === void 0 ? void 0 : _tmodel$animatingMap.has(key);
|
|
70
65
|
if (isAnimating && tmodel.getTargetSteps(key) > 0) {
|
|
71
|
-
|
|
66
|
+
getAnimationManager().cancelKey(tmodel, key);
|
|
72
67
|
}
|
|
73
68
|
return targetValue;
|
|
74
69
|
}
|
|
@@ -90,33 +85,33 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
90
85
|
var options = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : {};
|
|
91
86
|
var targetValue;
|
|
92
87
|
if (typeof key === 'string') {
|
|
93
|
-
var cleanKey =
|
|
88
|
+
var cleanKey = TargetUtil.getTargetName(key);
|
|
94
89
|
key = !key.endsWith('+') ? key + "+" : key;
|
|
95
90
|
tmodel.allTargetMap[cleanKey] = key;
|
|
96
91
|
}
|
|
97
|
-
if (
|
|
98
|
-
var vSteps =
|
|
99
|
-
var vInterval =
|
|
100
|
-
var vEasing =
|
|
101
|
-
var vCycles =
|
|
92
|
+
if (TargetParser.isListTarget(value)) {
|
|
93
|
+
var vSteps = TUtil.isDefined(value.steps) ? value.steps : steps;
|
|
94
|
+
var vInterval = TUtil.isDefined(value.interval) ? value.interval : interval;
|
|
95
|
+
var vEasing = TUtil.isDefined(value.easing) ? value.easing : easing;
|
|
96
|
+
var vCycles = TUtil.isDefined(value.cycles) ? value.cycles : cycles;
|
|
102
97
|
targetValue = TargetExecutor.assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel);
|
|
103
98
|
TargetExecutor.assignListTarget(tmodel, key, targetValue, value.list, value.list[0], vSteps, vInterval, vEasing, vCycles);
|
|
104
|
-
} else if (
|
|
99
|
+
} else if (TargetParser.isTargetSpecObject(value)) {
|
|
105
100
|
var _options = TargetExecutor.getTargetOptions(value);
|
|
106
|
-
var valueArray =
|
|
101
|
+
var valueArray = TargetParser.getValueStepsCycles(tmodel, key, value);
|
|
107
102
|
var newValue = valueArray[0];
|
|
108
103
|
var newSteps = valueArray[1];
|
|
109
104
|
var newInterval = valueArray[2];
|
|
110
105
|
var newEasing = valueArray[3];
|
|
111
106
|
var newCycles = valueArray[4];
|
|
112
|
-
steps =
|
|
113
|
-
interval =
|
|
114
|
-
easing =
|
|
115
|
-
cycles =
|
|
107
|
+
steps = TUtil.isDefined(newSteps) ? newSteps : steps;
|
|
108
|
+
interval = TUtil.isDefined(newInterval) ? newInterval : interval;
|
|
109
|
+
easing = TUtil.isDefined(newEasing) ? newEasing : easing;
|
|
110
|
+
cycles = TUtil.isDefined(newCycles) ? newCycles : cycles;
|
|
116
111
|
TargetExecutor.executeImperativeTarget(tmodel, key, newValue, steps, interval, easing, originalTargetName, originalTModel, cycles, _options);
|
|
117
112
|
return;
|
|
118
|
-
} else if (
|
|
119
|
-
var completeValue =
|
|
113
|
+
} else if (TargetParser.isObjectTarget(key, value)) {
|
|
114
|
+
var completeValue = TargetData.cssFunctionMap[key] ? _objectSpread(_objectSpread({}, TargetData.cssFunctionMap[key]), value) : value;
|
|
120
115
|
Object.keys(completeValue).forEach(function (objectKey) {
|
|
121
116
|
var newValue = completeValue[objectKey];
|
|
122
117
|
var newSteps = steps;
|
|
@@ -124,26 +119,26 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
124
119
|
var newEasing = easing;
|
|
125
120
|
var newCycles = cycles;
|
|
126
121
|
var newOptions = options;
|
|
127
|
-
if (_typeof(newValue) === 'object' && !
|
|
122
|
+
if (_typeof(newValue) === 'object' && !TargetParser.isListTarget(newValue)) {
|
|
128
123
|
newOptions = TargetExecutor.getTargetOptions(newValue);
|
|
129
|
-
var _valueArray =
|
|
124
|
+
var _valueArray = TargetParser.getValueStepsCycles(tmodel, objectKey, completeValue[objectKey]);
|
|
130
125
|
newValue = _valueArray[0];
|
|
131
|
-
newSteps =
|
|
132
|
-
newInterval =
|
|
133
|
-
newEasing =
|
|
134
|
-
newCycles =
|
|
126
|
+
newSteps = TUtil.isDefined(_valueArray[1]) ? _valueArray[1] : steps;
|
|
127
|
+
newInterval = TUtil.isDefined(_valueArray[2]) ? _valueArray[2] : interval;
|
|
128
|
+
newEasing = TUtil.isDefined(_valueArray[3]) ? _valueArray[3] : easing;
|
|
129
|
+
newCycles = TUtil.isDefined(_valueArray[4]) ? _valueArray[4] : cycles;
|
|
135
130
|
}
|
|
136
131
|
TargetExecutor.executeImperativeTarget(tmodel, objectKey, newValue, newSteps, newInterval, newEasing, originalTargetName, originalTModel, newCycles, newOptions);
|
|
137
132
|
});
|
|
138
133
|
} else {
|
|
139
|
-
if (_typeof(value) === 'object' && !
|
|
140
|
-
var _valueArray2 =
|
|
134
|
+
if (_typeof(value) === 'object' && !TargetParser.isListTarget(value)) {
|
|
135
|
+
var _valueArray2 = TargetParser.getValueStepsCycles(tmodel, key, value);
|
|
141
136
|
if (value !== _valueArray2[0]) {
|
|
142
137
|
value = _valueArray2[0];
|
|
143
|
-
steps =
|
|
144
|
-
interval =
|
|
145
|
-
easing =
|
|
146
|
-
cycles =
|
|
138
|
+
steps = TUtil.isDefined(_valueArray2[1]) ? _valueArray2[1] : steps;
|
|
139
|
+
interval = TUtil.isDefined(_valueArray2[2]) ? _valueArray2[2] : interval;
|
|
140
|
+
easing = TUtil.isDefined(_valueArray2[3]) ? _valueArray2[3] : easing;
|
|
141
|
+
cycles = TUtil.isDefined(_valueArray2[4]) ? _valueArray2[4] : cycles;
|
|
147
142
|
TargetExecutor.executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel, cycles, options);
|
|
148
143
|
} else {
|
|
149
144
|
targetValue = TargetExecutor.assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel, cycles);
|
|
@@ -159,7 +154,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
159
154
|
TargetExecutor.assignTargetOptions(targetValue, options);
|
|
160
155
|
TargetExecutor.updateTarget(tmodel, targetValue, key, true);
|
|
161
156
|
if (tmodel.isTargetDone(key)) {
|
|
162
|
-
|
|
157
|
+
TargetUtil.shouldActivateNextTarget(tmodel, key);
|
|
163
158
|
}
|
|
164
159
|
}
|
|
165
160
|
}
|
|
@@ -178,8 +173,8 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
178
173
|
tmodel.setTargetMethodName(key, 'value');
|
|
179
174
|
var newStatus = TargetExecutor.calculateTargetStatus(tmodel, targetValue, key);
|
|
180
175
|
tmodel.setTargetStatus(key, newStatus);
|
|
181
|
-
if (!
|
|
182
|
-
|
|
176
|
+
if (!TargetData.ignoreRerun[key] && tmodel.shouldScheduleRun(key)) {
|
|
177
|
+
getRunScheduler().schedule(1, 'updateTarget2-' + tmodel.oid);
|
|
183
178
|
}
|
|
184
179
|
}
|
|
185
180
|
}, {
|
|
@@ -199,7 +194,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
199
194
|
return 'updating';
|
|
200
195
|
} else if (tmodel.isTargetInLoop(key) || cycle < cycles - 1) {
|
|
201
196
|
return 'active';
|
|
202
|
-
} else if ((_tmodel$targets$key = tmodel.targets[key]) !== null && _tmodel$targets$key !== void 0 && _tmodel$targets$key.fetchAction && !
|
|
197
|
+
} else if ((_tmodel$targets$key = tmodel.targets[key]) !== null && _tmodel$targets$key !== void 0 && _tmodel$targets$key.fetchAction && !getLoader().isLoadingSuccessful(tmodel, key)) {
|
|
203
198
|
return 'fetching';
|
|
204
199
|
} else {
|
|
205
200
|
return 'done';
|
|
@@ -209,9 +204,9 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
209
204
|
key: "assignListTarget",
|
|
210
205
|
value: function assignListTarget(tmodel, key, targetValue, valueList, initialValue, steps, interval, easing, cycles) {
|
|
211
206
|
targetValue.valueList = valueList;
|
|
212
|
-
targetValue.stepList = Array.isArray(steps) ? steps :
|
|
213
|
-
targetValue.intervalList = Array.isArray(interval) ? interval :
|
|
214
|
-
targetValue.easingList = Array.isArray(easing) ? easing :
|
|
207
|
+
targetValue.stepList = Array.isArray(steps) ? steps : TUtil.isDefined(steps) && steps > 0 ? [steps] : [1];
|
|
208
|
+
targetValue.intervalList = Array.isArray(interval) ? interval : TUtil.isDefined(interval) ? [interval || 8] : [8];
|
|
209
|
+
targetValue.easingList = Array.isArray(easing) ? easing : TUtil.isDefined(easing) ? [easing] : [Easing.LINEAR];
|
|
215
210
|
targetValue.cycles = cycles;
|
|
216
211
|
targetValue.valuePointer = 1;
|
|
217
212
|
targetValue.value = valueList[1];
|
|
@@ -231,7 +226,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
231
226
|
delete targetValue.stepList;
|
|
232
227
|
delete targetValue.intervalList;
|
|
233
228
|
delete targetValue.easingList;
|
|
234
|
-
if (
|
|
229
|
+
if (TUtil.isDefined(targetValue.valuePointer)) {
|
|
235
230
|
targetValue.valuePointer = 0;
|
|
236
231
|
}
|
|
237
232
|
targetValue.initialValue = initialValue;
|
|
@@ -255,10 +250,10 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
255
250
|
if (!tmodel.hasValidAnimation() || !tmodel.canBeAnimated(key)) {
|
|
256
251
|
tmodel.val(key, newValue);
|
|
257
252
|
tmodel.setActual(key, newValue);
|
|
258
|
-
|
|
253
|
+
TUtil.handleValueChange(tmodel, key);
|
|
259
254
|
return;
|
|
260
255
|
}
|
|
261
|
-
|
|
256
|
+
AnimationUtil.overrideAnimatedKeyWithSnap(tmodel, key, newValue);
|
|
262
257
|
}
|
|
263
258
|
}, {
|
|
264
259
|
key: "getTargetOptions",
|
|
@@ -288,59 +283,60 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
|
|
|
288
283
|
key: "resolveTargetValue",
|
|
289
284
|
value: function resolveTargetValue(tmodel, key) {
|
|
290
285
|
var cycle = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : tmodel.getTargetCycle(key);
|
|
291
|
-
if (
|
|
286
|
+
if (TargetParser.isIntervalTarget(tmodel.targets[key]) && cycle === 1) {
|
|
292
287
|
return;
|
|
293
288
|
}
|
|
294
|
-
var targetInitial = !tmodel.targetValues[key] &&
|
|
295
|
-
var valueArray =
|
|
289
|
+
var targetInitial = !tmodel.targetValues[key] && TUtil.isDefined(tmodel.targets[key].initialValue) ? tmodel.targets[key].initialValue : undefined;
|
|
290
|
+
var valueArray = TargetParser.getValueStepsCycles(tmodel, key, tmodel.targets[key], cycle);
|
|
296
291
|
var newValue = valueArray[0];
|
|
297
292
|
var newSteps = valueArray[1] || 0;
|
|
298
293
|
var newInterval = valueArray[2] || 0;
|
|
299
294
|
var newEasing = valueArray[3];
|
|
300
295
|
var newCycles = valueArray[4] || 1;
|
|
301
|
-
var targetValue = tmodel.targetValues[key] ||
|
|
296
|
+
var targetValue = tmodel.targetValues[key] || TargetUtil.emptyValue();
|
|
302
297
|
tmodel.targetValues[key] = targetValue;
|
|
303
|
-
var easing =
|
|
304
|
-
if (
|
|
298
|
+
var easing = TUtil.isDefined(newEasing) ? newEasing : TUtil.isDefined(tmodel.targets[key].easing) ? tmodel.targets[key].easing : undefined;
|
|
299
|
+
if (TargetParser.isIntervalTarget(newValue)) {
|
|
305
300
|
TargetExecutor.assignSingleTarget(targetValue, undefined, targetInitial, 0, 2, newValue.interval, easing);
|
|
306
|
-
} else if (
|
|
301
|
+
} else if (TargetParser.isChildTarget(key, newValue)) {
|
|
307
302
|
tmodel.addChild(newValue);
|
|
308
303
|
TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
|
|
309
|
-
} else if (
|
|
304
|
+
} else if (TargetParser.isChildrenTarget(key, newValue)) {
|
|
310
305
|
var values = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
|
|
311
306
|
values.forEach(function (child) {
|
|
312
307
|
tmodel.addChild(child);
|
|
313
|
-
|
|
308
|
+
TargetUtil.markAddChild(tmodel, TargetUtil.currentTargetName, tmodel.addedChildren[tmodel.addedChildren.length - 1].child);
|
|
314
309
|
});
|
|
315
310
|
TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
|
|
316
|
-
} else if (
|
|
317
|
-
var child = new
|
|
311
|
+
} else if (TargetParser.isChildObjectTarget(key, tmodel.targets[key])) {
|
|
312
|
+
var child = new TModel(key, tmodel.targets[key]);
|
|
318
313
|
tmodel.addChild(child);
|
|
319
314
|
var filteredValue = Object.fromEntries(Object.entries(newValue).filter(function (_ref) {
|
|
320
315
|
var _ref2 = _slicedToArray(_ref, 1),
|
|
321
316
|
k = _ref2[0];
|
|
322
|
-
return !
|
|
317
|
+
return !TargetData.excludedTargetKeys.has(k);
|
|
323
318
|
}));
|
|
324
319
|
TargetExecutor.assignSingleTarget(targetValue, filteredValue, undefined, 0, newCycles, newInterval, easing);
|
|
325
320
|
} else if (_typeof(newValue) === 'object' && newValue.asChild === true) {
|
|
326
|
-
var _child = new
|
|
321
|
+
var _child = new TModel(key, newValue);
|
|
327
322
|
tmodel.addChild(_child);
|
|
328
323
|
TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
|
|
329
|
-
} else if (
|
|
324
|
+
} else if (TargetParser.isFetchTarget(key, newValue)) {
|
|
330
325
|
TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
|
|
331
|
-
|
|
332
|
-
} else if (
|
|
326
|
+
getLoader().fetch(tmodel, newValue);
|
|
327
|
+
} else if (TargetParser.isFetchImageTarget(key, newValue)) {
|
|
333
328
|
TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
|
|
334
|
-
|
|
335
|
-
} else if (
|
|
329
|
+
getLoader().fetchImage(tmodel, newValue);
|
|
330
|
+
} else if (TargetParser.isListTarget(newValue)) {
|
|
336
331
|
TargetExecutor.assignListTarget(tmodel, key, targetValue, newValue.list, newValue.list[0], newSteps, newInterval, easing, newCycles);
|
|
337
332
|
} else {
|
|
338
333
|
var _tmodel$targets$key$d, _tmodel$targets$key2;
|
|
339
|
-
if (newSteps > 0 && !
|
|
334
|
+
if (newSteps > 0 && !TUtil.areEqual(tmodel.val(key), newValue, (_tmodel$targets$key$d = (_tmodel$targets$key2 = tmodel.targets[key]) === null || _tmodel$targets$key2 === void 0 ? void 0 : _tmodel$targets$key2.deepEquality) !== null && _tmodel$targets$key$d !== void 0 ? _tmodel$targets$key$d : false)) {
|
|
340
335
|
tmodel.resetTargetStep(key);
|
|
341
336
|
}
|
|
342
337
|
TargetExecutor.assignSingleTarget(targetValue, newValue, targetInitial, newSteps, newCycles, newInterval, easing);
|
|
343
338
|
}
|
|
344
339
|
}
|
|
345
340
|
}]);
|
|
346
|
-
}();
|
|
341
|
+
}();
|
|
342
|
+
export { TargetExecutor };
|