targetj 1.0.240 → 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 +27 -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 +1 -1
package/build/BaseModel.js
CHANGED
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.BaseModel = void 0;
|
|
7
|
-
var _App = require("./App.js");
|
|
8
|
-
var _TargetExecutor = require("./TargetExecutor.js");
|
|
9
|
-
var _TUtil = require("./TUtil.js");
|
|
10
|
-
var _TargetParser = require("./TargetParser.js");
|
|
11
|
-
var _TargetUtil = require("./TargetUtil.js");
|
|
12
|
-
var _TargetData = require("./TargetData.js");
|
|
13
|
-
var _$Dom = require("./$Dom.js");
|
|
14
1
|
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
15
2
|
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."); }
|
|
16
3
|
function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
|
|
@@ -29,10 +16,18 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
|
|
|
29
16
|
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
30
17
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
31
18
|
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); }
|
|
19
|
+
import { App, getRunScheduler, getLocationManager, getAnimationManager, getDomTModelById, getEvents } from "./App.js";
|
|
20
|
+
import { TargetExecutor } from "./TargetExecutor.js";
|
|
21
|
+
import { TUtil } from "./TUtil.js";
|
|
22
|
+
import { TargetParser } from "./TargetParser.js";
|
|
23
|
+
import { TargetUtil } from "./TargetUtil.js";
|
|
24
|
+
import { TargetData } from "./TargetData.js";
|
|
25
|
+
import { $Dom } from "./$Dom.js";
|
|
26
|
+
|
|
32
27
|
/**
|
|
33
28
|
* It provides the target state and associated logic to the TModel.
|
|
34
29
|
*/
|
|
35
|
-
var BaseModel =
|
|
30
|
+
var BaseModel = /*#__PURE__*/function () {
|
|
36
31
|
function BaseModel(type, targets, oid) {
|
|
37
32
|
var _targets;
|
|
38
33
|
_classCallCheck(this, BaseModel);
|
|
@@ -42,18 +37,18 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
42
37
|
}
|
|
43
38
|
this.targets = Object.assign({}, targets);
|
|
44
39
|
oid = oid || this.targets.id;
|
|
45
|
-
if (!
|
|
40
|
+
if (!TUtil.isDefined(oid)) {
|
|
46
41
|
this.type = this.targets.otype || type || 'blank';
|
|
47
|
-
var uniqueId =
|
|
42
|
+
var uniqueId = App.getOid(this.type);
|
|
48
43
|
this.oid = uniqueId.oid;
|
|
49
44
|
this.oidNum = uniqueId.num;
|
|
50
45
|
} else {
|
|
51
|
-
|
|
46
|
+
App.getOid(oid);
|
|
52
47
|
this.type = oid;
|
|
53
48
|
this.oid = oid;
|
|
54
49
|
this.oidNum = 0;
|
|
55
50
|
}
|
|
56
|
-
if (!((_targets = targets) !== null && _targets !== void 0 && _targets.sourceDom) &&
|
|
51
|
+
if (!((_targets = targets) !== null && _targets !== void 0 && _targets.sourceDom) && TUtil.isDefined(oid)) {
|
|
57
52
|
this.originalId = oid;
|
|
58
53
|
}
|
|
59
54
|
this._state = {};
|
|
@@ -212,27 +207,27 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
212
207
|
var _this = this;
|
|
213
208
|
this.targetsVersion = 1;
|
|
214
209
|
this.originalTargetNames = Object.keys(this.targets).filter(function (key) {
|
|
215
|
-
return !
|
|
210
|
+
return !TargetData.excludedTargetKeys.has(key);
|
|
216
211
|
});
|
|
217
212
|
this.functionTargetNames = [];
|
|
218
213
|
this.allTargetMap = {};
|
|
219
|
-
if (
|
|
220
|
-
|
|
214
|
+
if (TUtil.isDefined(this.originalId) && getDomTModelById(this.originalId)) {
|
|
215
|
+
TUtil.mergeTargets(getDomTModelById(this.originalId), this);
|
|
221
216
|
this.toDiscard = true;
|
|
222
217
|
return;
|
|
223
218
|
}
|
|
224
|
-
this.actualValues =
|
|
219
|
+
this.actualValues = TargetData.defaultActualValues();
|
|
225
220
|
this.targetValues = {};
|
|
226
221
|
this.activeTargetMap = {};
|
|
227
222
|
this.activeTargetList = [];
|
|
228
223
|
this.originalTargetNames = Object.keys(this.targets).filter(function (key) {
|
|
229
|
-
return !
|
|
224
|
+
return !TargetData.excludedTargetKeys.has(key);
|
|
230
225
|
}).map(function (key) {
|
|
231
226
|
return key.startsWith('_') ? key.slice(1) : key;
|
|
232
227
|
});
|
|
233
|
-
var domExists =
|
|
228
|
+
var domExists = $Dom.query("#".concat(this.oid)) || this.originalTargetNames.indexOf('$dom') >= 0;
|
|
234
229
|
if (!domExists && !this.excludeDefaultStyling()) {
|
|
235
|
-
Object.entries(
|
|
230
|
+
Object.entries(TargetData.defaultTargetStyles).forEach(function (_ref) {
|
|
236
231
|
var _ref2 = _slicedToArray(_ref, 2),
|
|
237
232
|
key = _ref2[0],
|
|
238
233
|
value = _ref2[1];
|
|
@@ -240,30 +235,30 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
240
235
|
_this.targets[key] = value;
|
|
241
236
|
}
|
|
242
237
|
});
|
|
243
|
-
if (this.targets['canHaveDom'] !== false && !
|
|
238
|
+
if (this.targets['canHaveDom'] !== false && !TUtil.isDefined(this.targets['domHolder'])) {
|
|
244
239
|
this.targets['domHolder'] = true;
|
|
245
240
|
}
|
|
246
241
|
} else if (domExists) {
|
|
247
242
|
this.targets['domIsland'] = true;
|
|
248
|
-
if (!
|
|
243
|
+
if (!TUtil.isDefined(this.targets['reuseDomDefinition'])) {
|
|
249
244
|
this.targets['reuseDomDefinition'] = true;
|
|
250
245
|
this.targets['domHolder'] = true;
|
|
251
|
-
if (!
|
|
246
|
+
if (!TUtil.isDefined(this.targets['excludeXYCalc'])) {
|
|
252
247
|
this.targets['excludeXYCalc'] = true;
|
|
253
248
|
}
|
|
254
|
-
if (!
|
|
249
|
+
if (!TUtil.isDefined(this.targets['x'])) {
|
|
255
250
|
this.targets['excludeX'] = true;
|
|
256
251
|
}
|
|
257
|
-
if (!
|
|
252
|
+
if (!TUtil.isDefined(this.targets['y'])) {
|
|
258
253
|
this.targets['excludeY'] = true;
|
|
259
254
|
}
|
|
260
|
-
if (!
|
|
255
|
+
if (!TUtil.isDefined(this.targets['position'])) {
|
|
261
256
|
this.targets['position'] = 'relative';
|
|
262
257
|
}
|
|
263
258
|
}
|
|
264
259
|
}
|
|
265
260
|
Object.keys(this.targets).filter(function (key) {
|
|
266
|
-
return !
|
|
261
|
+
return !TargetData.excludedTargetKeys.has(key);
|
|
267
262
|
}).forEach(function (key, keyIndex) {
|
|
268
263
|
_this.processNewTarget(key, keyIndex);
|
|
269
264
|
});
|
|
@@ -272,9 +267,9 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
272
267
|
key: "processNewTarget",
|
|
273
268
|
value: function processNewTarget(key, keyIndex) {
|
|
274
269
|
this.targetsVersion++;
|
|
275
|
-
var cleanKey =
|
|
270
|
+
var cleanKey = TargetUtil.getTargetName(key);
|
|
276
271
|
var target = this.targets[key];
|
|
277
|
-
if (!
|
|
272
|
+
if (!TUtil.isDefined(target)) {
|
|
278
273
|
this.delVal(key);
|
|
279
274
|
return;
|
|
280
275
|
}
|
|
@@ -286,23 +281,23 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
286
281
|
}
|
|
287
282
|
var targetType = _typeof(target);
|
|
288
283
|
var isInactiveKey = key.startsWith('_') || key.endsWith('$');
|
|
289
|
-
var needsTargetExecution =
|
|
290
|
-
var isExternalEvent = !!
|
|
291
|
-
var isInternalEvent = !!
|
|
284
|
+
var needsTargetExecution = TargetData.mustExecuteTargets[cleanKey] || isInactiveKey || targetType !== 'string' && targetType !== 'number' && targetType !== 'boolean';
|
|
285
|
+
var isExternalEvent = !!TargetData.allEventMap[cleanKey];
|
|
286
|
+
var isInternalEvent = !!TargetData.internalEventMap[cleanKey];
|
|
292
287
|
if ((targetType !== 'object' || Array.isArray(target)) && needsTargetExecution) {
|
|
293
|
-
target =
|
|
288
|
+
target = TargetUtil.wrapTarget(this, target, key);
|
|
294
289
|
}
|
|
295
290
|
var doesNextTargetUsePrevValue = false;
|
|
296
|
-
if (
|
|
291
|
+
if (TUtil.isDefined(keyIndex)) {
|
|
297
292
|
var prevKey = keyIndex > 0 ? this.originalTargetNames[keyIndex - 1] : undefined;
|
|
298
293
|
var nextKey = keyIndex < this.originalTargetNames.length - 1 ? this.originalTargetNames[keyIndex + 1] : undefined;
|
|
299
294
|
doesNextTargetUsePrevValue = nextKey && nextKey.endsWith('$') ? true : false;
|
|
300
295
|
if (doesNextTargetUsePrevValue || isInactiveKey || isExternalEvent || isInternalEvent || targetType === 'object' || targetType === 'function') {
|
|
301
|
-
if (!
|
|
296
|
+
if (!TUtil.isDefined(target.value) && !TargetParser.isChildObjectTarget(key, target) && !TargetParser.isIntervalTarget(target)) {
|
|
302
297
|
needsTargetExecution = true;
|
|
303
|
-
target =
|
|
298
|
+
target = TargetUtil.wrapTarget(this, target, key);
|
|
304
299
|
}
|
|
305
|
-
|
|
300
|
+
TargetUtil.bindTarget(this, key, prevKey, nextKey, keyIndex);
|
|
306
301
|
}
|
|
307
302
|
}
|
|
308
303
|
if (key.startsWith('_')) {
|
|
@@ -328,21 +323,21 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
328
323
|
if (isInactiveKey) {
|
|
329
324
|
this.targets[key].active = false;
|
|
330
325
|
}
|
|
331
|
-
if (
|
|
326
|
+
if (TargetData.bypassInitialProcessingTargetMap[cleanKey]) {
|
|
332
327
|
return;
|
|
333
328
|
}
|
|
334
|
-
if (
|
|
329
|
+
if (TUtil.isDefined(target.initialValue)) {
|
|
335
330
|
this.val(key, target.initialValue);
|
|
336
331
|
}
|
|
337
|
-
if (target.active !== false ||
|
|
332
|
+
if (target.active !== false || TUtil.isDefined(target.initialValue)) {
|
|
338
333
|
this.addToStyleTargetList(key);
|
|
339
334
|
}
|
|
340
|
-
if (
|
|
335
|
+
if (TargetParser.isIntervalTarget(target)) {
|
|
341
336
|
target.cycles = 2;
|
|
342
337
|
target.isInterval = true;
|
|
343
338
|
} else if (!needsTargetExecution) {
|
|
344
339
|
var _target;
|
|
345
|
-
this.val(cleanKey,
|
|
340
|
+
this.val(cleanKey, TUtil.isDefined((_target = target) === null || _target === void 0 ? void 0 : _target.value) ? target.value : target);
|
|
346
341
|
return;
|
|
347
342
|
}
|
|
348
343
|
if (target.active !== false && this.canTargetBeActivated(key)) {
|
|
@@ -353,7 +348,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
353
348
|
}, {
|
|
354
349
|
key: "activate",
|
|
355
350
|
value: function activate(targetName) {
|
|
356
|
-
|
|
351
|
+
getLocationManager().addToActivatedList(this);
|
|
357
352
|
this.currentStatus = 'active';
|
|
358
353
|
if (targetName && this.isTargetEnabled(targetName) && this.activatedTargets.indexOf(targetName) === -1) {
|
|
359
354
|
this.activatedTargets.push(targetName);
|
|
@@ -390,12 +385,12 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
390
385
|
key: "addToStyleTargetList",
|
|
391
386
|
value: function addToStyleTargetList(key, enforce) {
|
|
392
387
|
var _this$allStyleTargetM;
|
|
393
|
-
key =
|
|
394
|
-
if (!enforce && (this.excludeStyling() || this.targets["exclude".concat(
|
|
388
|
+
key = TargetUtil.getTargetName(key);
|
|
389
|
+
if (!enforce && (this.excludeStyling() || this.targets["exclude".concat(TUtil.capitalizeFirstLetter(key))])) {
|
|
395
390
|
return;
|
|
396
391
|
}
|
|
397
|
-
var isAsyncStyleTarget =
|
|
398
|
-
var isAttributeTarget =
|
|
392
|
+
var isAsyncStyleTarget = TargetData.asyncStyleTargetMap[key];
|
|
393
|
+
var isAttributeTarget = TargetData.attributeTargetMap[key];
|
|
399
394
|
if (isAsyncStyleTarget || isAttributeTarget) {
|
|
400
395
|
var _this$asyncStyleTarge;
|
|
401
396
|
if (!((_this$asyncStyleTarge = this.asyncStyleTargetMap) !== null && _this$asyncStyleTarge !== void 0 && _this$asyncStyleTarge.has(key))) {
|
|
@@ -405,7 +400,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
405
400
|
} else if (this.isStyleTarget(key)) {
|
|
406
401
|
var _this$styleTargetMap;
|
|
407
402
|
var styleFlag = true;
|
|
408
|
-
if (
|
|
403
|
+
if (TargetData.transformMap[key]) {
|
|
409
404
|
if (this.getParent()) {
|
|
410
405
|
this.calcAbsolutePosition(this.getX(), this.getY());
|
|
411
406
|
}
|
|
@@ -418,7 +413,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
418
413
|
if (this.styleMap[key] === Math.floor(this.val('dim'))) {
|
|
419
414
|
styleFlag = false;
|
|
420
415
|
}
|
|
421
|
-
} else if (
|
|
416
|
+
} else if (TUtil.isDefined(this.val(key)) && this.styleMap[key] === this.val(key)) {
|
|
422
417
|
styleFlag = false;
|
|
423
418
|
}
|
|
424
419
|
if (styleFlag && !((_this$styleTargetMap = this.styleTargetMap) !== null && _this$styleTargetMap !== void 0 && _this$styleTargetMap.has(key))) {
|
|
@@ -426,7 +421,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
426
421
|
this.styleTargetMap.set(key, true);
|
|
427
422
|
}
|
|
428
423
|
}
|
|
429
|
-
if (
|
|
424
|
+
if (TargetData.styleSet.has(key) && !((_this$allStyleTargetM = this.allStyleTargetMap) !== null && _this$allStyleTargetM !== void 0 && _this$allStyleTargetM.has(key))) {
|
|
430
425
|
this.allStyleTargetMap || (this.allStyleTargetMap = new Map());
|
|
431
426
|
this.allStyleTargetMap.set(key, true);
|
|
432
427
|
}
|
|
@@ -434,7 +429,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
434
429
|
}, {
|
|
435
430
|
key: "isStyleTarget",
|
|
436
431
|
value: function isStyleTarget(key) {
|
|
437
|
-
return
|
|
432
|
+
return TargetData.styleTargetMap[key];
|
|
438
433
|
}
|
|
439
434
|
}, {
|
|
440
435
|
key: "removeTarget",
|
|
@@ -464,14 +459,14 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
464
459
|
_this2.processNewTarget(key, keyIndex);
|
|
465
460
|
});
|
|
466
461
|
if (this.hasDom()) {
|
|
467
|
-
|
|
462
|
+
getEvents().attachEvents([this]);
|
|
468
463
|
}
|
|
469
|
-
(_getRunScheduler =
|
|
464
|
+
(_getRunScheduler = getRunScheduler()) === null || _getRunScheduler === void 0 || _getRunScheduler.schedule(1, 'addTargets-' + this.oid);
|
|
470
465
|
}
|
|
471
466
|
}, {
|
|
472
467
|
key: "getTargetStepPercent",
|
|
473
468
|
value: function getTargetStepPercent(key, step, steps) {
|
|
474
|
-
step = !
|
|
469
|
+
step = !TUtil.isDefined(step) ? this.getTargetStep(key) : step;
|
|
475
470
|
return steps ? step / steps : 1;
|
|
476
471
|
}
|
|
477
472
|
}, {
|
|
@@ -543,7 +538,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
543
538
|
var oldStatus = targetValue.status;
|
|
544
539
|
if (status === 'done' && oldStatus !== 'done' && oldStatus !== 'complete' && !targetValue.resetFlag) {
|
|
545
540
|
targetValue.completeCount++;
|
|
546
|
-
targetValue.completeTime =
|
|
541
|
+
targetValue.completeTime = TUtil.now();
|
|
547
542
|
}
|
|
548
543
|
targetValue.resetFlag = false;
|
|
549
544
|
targetValue.status = status;
|
|
@@ -582,7 +577,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
582
577
|
}, {
|
|
583
578
|
key: "isTargetTreeComplete",
|
|
584
579
|
value: function isTargetTreeComplete(key, completionScope) {
|
|
585
|
-
return
|
|
580
|
+
return TargetUtil.isTargetTreeComplete(this, key, completionScope) === true;
|
|
586
581
|
}
|
|
587
582
|
}, {
|
|
588
583
|
key: "isTargetVisibleTreeComplete",
|
|
@@ -592,22 +587,22 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
592
587
|
}, {
|
|
593
588
|
key: "isTargetFullyCompleted",
|
|
594
589
|
value: function isTargetFullyCompleted(key) {
|
|
595
|
-
return
|
|
590
|
+
return TargetUtil.isTargetFullyCompleted(this, key) === true;
|
|
596
591
|
}
|
|
597
592
|
}, {
|
|
598
593
|
key: "arePreviousTargetsComplete",
|
|
599
594
|
value: function arePreviousTargetsComplete(key) {
|
|
600
|
-
return
|
|
595
|
+
return TargetUtil.arePreviousTargetsComplete(this, key) === true;
|
|
601
596
|
}
|
|
602
597
|
}, {
|
|
603
598
|
key: "cleanupTarget",
|
|
604
599
|
value: function cleanupTarget(key) {
|
|
605
|
-
|
|
600
|
+
TargetUtil.cleanupTarget(this, key);
|
|
606
601
|
}
|
|
607
602
|
}, {
|
|
608
603
|
key: "isComplete",
|
|
609
604
|
value: function isComplete() {
|
|
610
|
-
return
|
|
605
|
+
return TargetUtil.isTModelComplete(this);
|
|
611
606
|
}
|
|
612
607
|
}, {
|
|
613
608
|
key: "isExecuted",
|
|
@@ -640,7 +635,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
640
635
|
key: "isTargetEnabled",
|
|
641
636
|
value: function isTargetEnabled(key) {
|
|
642
637
|
var target = this.targets[key];
|
|
643
|
-
if (!
|
|
638
|
+
if (!TUtil.isDefined(target)) {
|
|
644
639
|
return false;
|
|
645
640
|
}
|
|
646
641
|
if (typeof target.enabledOn === 'function') {
|
|
@@ -655,7 +650,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
655
650
|
value: function doesTargetEqualActual(key) {
|
|
656
651
|
if (this.targetValues[key]) {
|
|
657
652
|
var deepEquality = this.targets[key] ? this.targets[key].deepEquality : false;
|
|
658
|
-
return deepEquality ?
|
|
653
|
+
return deepEquality ? TUtil.areEqual(this.getTargetValue(key), this.val(key), deepEquality) : this.getTargetValue(key) === this.val(key);
|
|
659
654
|
}
|
|
660
655
|
return false;
|
|
661
656
|
}
|
|
@@ -685,12 +680,12 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
685
680
|
key: "isScheduledPending",
|
|
686
681
|
value: function isScheduledPending(key) {
|
|
687
682
|
var remainingTime = this.getScheduleRemainingTime(key);
|
|
688
|
-
if (
|
|
683
|
+
if (TUtil.isDefined(remainingTime)) {
|
|
689
684
|
return remainingTime > 0;
|
|
690
685
|
}
|
|
691
686
|
var lastScheduledTime = this.getScheduleTimeStamp(key);
|
|
692
687
|
var interval = this.getTargetInterval(key);
|
|
693
|
-
return
|
|
688
|
+
return TUtil.isDefined(lastScheduledTime) && lastScheduledTime + interval > TUtil.now();
|
|
694
689
|
}
|
|
695
690
|
}, {
|
|
696
691
|
key: "getScheduleRemainingTime",
|
|
@@ -767,10 +762,10 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
767
762
|
var loop = typeof t.loop === 'function' ? t.loop.call(this, key) : t.loop;
|
|
768
763
|
if (loop === 'passive') {
|
|
769
764
|
var _t$deepEquality;
|
|
770
|
-
var values =
|
|
765
|
+
var values = TargetParser.getValueStepsCycles(this, key);
|
|
771
766
|
var nextValue = values[0];
|
|
772
767
|
var currentTargetValue = this.getTargetValue(key);
|
|
773
|
-
return !
|
|
768
|
+
return !TUtil.areEqual(nextValue, currentTargetValue, (_t$deepEquality = t.deepEquality) !== null && _t$deepEquality !== void 0 ? _t$deepEquality : false);
|
|
774
769
|
}
|
|
775
770
|
return true;
|
|
776
771
|
}
|
|
@@ -938,7 +933,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
938
933
|
key: "setLastUpdate",
|
|
939
934
|
value: function setLastUpdate(key) {
|
|
940
935
|
if (this.targetValues[key]) {
|
|
941
|
-
this.targetValues[key].lastUpdate =
|
|
936
|
+
this.targetValues[key].lastUpdate = TUtil.now();
|
|
942
937
|
this.targetValues[key].updateCount++;
|
|
943
938
|
}
|
|
944
939
|
}
|
|
@@ -956,13 +951,13 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
956
951
|
if (typeof key === 'string') {
|
|
957
952
|
key = !key.endsWith('+') ? key + "+" : key;
|
|
958
953
|
}
|
|
959
|
-
var originalTargetName =
|
|
960
|
-
var originalTModel =
|
|
954
|
+
var originalTargetName = TargetUtil.currentTargetName;
|
|
955
|
+
var originalTModel = TargetUtil.currentTModel;
|
|
961
956
|
if (this.getParent() === originalTModel) {
|
|
962
|
-
|
|
957
|
+
TargetUtil.markChildAction(originalTModel, originalTargetName, this);
|
|
963
958
|
}
|
|
964
959
|
this.markLayoutDirty(key);
|
|
965
|
-
|
|
960
|
+
TargetExecutor.executeImperativeTarget(this, key, value, steps, interval, easing, originalTargetName, originalTModel);
|
|
966
961
|
return this;
|
|
967
962
|
}
|
|
968
963
|
}, {
|
|
@@ -988,7 +983,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
988
983
|
} finally {
|
|
989
984
|
_iterator2.f();
|
|
990
985
|
}
|
|
991
|
-
|
|
986
|
+
getAnimationManager().deleteAnimation(this);
|
|
992
987
|
}
|
|
993
988
|
}, {
|
|
994
989
|
key: "hasTargetUpdates",
|
|
@@ -1058,7 +1053,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
1058
1053
|
try {
|
|
1059
1054
|
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
|
1060
1055
|
var target = _step3.value;
|
|
1061
|
-
if (this.isTargetImperative(target) && (this.targetValues[target].originalTargetName === originalTargetName ||
|
|
1056
|
+
if (this.isTargetImperative(target) && (this.targetValues[target].originalTargetName === originalTargetName || TargetUtil.getTargetName(target) === originalTargetName)) {
|
|
1062
1057
|
return true;
|
|
1063
1058
|
}
|
|
1064
1059
|
}
|
|
@@ -1131,7 +1126,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
1131
1126
|
if (!this.animatingMap) {
|
|
1132
1127
|
return false;
|
|
1133
1128
|
}
|
|
1134
|
-
var _TargetUtil$getOrigin =
|
|
1129
|
+
var _TargetUtil$getOrigin = TargetUtil.getOriginalNames(this, key),
|
|
1135
1130
|
originalTargetName = _TargetUtil$getOrigin.originalTargetName;
|
|
1136
1131
|
return this.animatingMap.has(key) && this.animatingMap.get(key).originalTargetName === originalTargetName;
|
|
1137
1132
|
}
|
|
@@ -1263,27 +1258,27 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
1263
1258
|
actualOptions = value;
|
|
1264
1259
|
}
|
|
1265
1260
|
if (this.canTargetBeActivated(key)) {
|
|
1266
|
-
var resetOptions =
|
|
1261
|
+
var resetOptions = TargetUtil.getResetOptions(actualOptions);
|
|
1267
1262
|
if (resetOptions.shouldReset) {
|
|
1268
|
-
|
|
1263
|
+
TargetUtil.resetTargetState(this, key, resetOptions);
|
|
1269
1264
|
}
|
|
1270
|
-
if (
|
|
1265
|
+
if (TUtil.isDefined(actualValue)) {
|
|
1271
1266
|
this.val("___".concat(key), actualValue);
|
|
1272
1267
|
}
|
|
1273
1268
|
if (this.isVisible()) {
|
|
1274
1269
|
this.markLayoutDirty(key);
|
|
1275
1270
|
}
|
|
1276
|
-
var invokerTModel =
|
|
1277
|
-
var invokerTarget =
|
|
1278
|
-
var targetValue = this.targetValues[key] ||
|
|
1271
|
+
var invokerTModel = TargetUtil.currentTModel;
|
|
1272
|
+
var invokerTarget = TargetUtil.currentTargetName;
|
|
1273
|
+
var targetValue = this.targetValues[key] || TargetUtil.emptyValue();
|
|
1279
1274
|
if (this.getParent() === invokerTModel) {
|
|
1280
|
-
|
|
1275
|
+
TargetUtil.markChildAction(invokerTModel, invokerTarget, this);
|
|
1281
1276
|
}
|
|
1282
1277
|
targetValue.invokerTModel = invokerTModel;
|
|
1283
1278
|
targetValue.invokerTarget = invokerTarget;
|
|
1284
1279
|
if (this.targetValues[key]) {
|
|
1285
|
-
targetValue.activationTime =
|
|
1286
|
-
targetValue.lastUpdate =
|
|
1280
|
+
targetValue.activationTime = TUtil.now();
|
|
1281
|
+
targetValue.lastUpdate = TUtil.now();
|
|
1287
1282
|
targetValue.isImperative = false;
|
|
1288
1283
|
targetValue.executionFlag = false;
|
|
1289
1284
|
targetValue.scheduleTimeStamp = undefined;
|
|
@@ -1309,7 +1304,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
1309
1304
|
}, {
|
|
1310
1305
|
key: "setTargetMethodName",
|
|
1311
1306
|
value: function setTargetMethodName(targetName, methodName) {
|
|
1312
|
-
if (
|
|
1307
|
+
if (TargetData.ignoreTargetMethodNameMap[targetName] && !this.isTargetUpdating(targetName) && !this.isTargetImperative(targetName)) {
|
|
1313
1308
|
return;
|
|
1314
1309
|
}
|
|
1315
1310
|
if (!this.targetMethodMap[targetName]) {
|
|
@@ -1320,4 +1315,5 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
|
|
|
1320
1315
|
}
|
|
1321
1316
|
}
|
|
1322
1317
|
}]);
|
|
1323
|
-
}();
|
|
1318
|
+
}();
|
|
1319
|
+
export { BaseModel };
|
package/build/Bracket.js
CHANGED
|
@@ -1,12 +1,4 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
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); }
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports.Bracket = void 0;
|
|
8
|
-
var _TModel2 = require("./TModel.js");
|
|
9
|
-
var _Viewport = require("./Viewport.js");
|
|
10
2
|
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
11
3
|
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); } }
|
|
12
4
|
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
@@ -19,11 +11,14 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
19
11
|
function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
|
|
20
12
|
function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
|
|
21
13
|
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
14
|
+
import { TModel } from "./TModel.js";
|
|
15
|
+
import { Viewport } from "./Viewport.js";
|
|
16
|
+
|
|
22
17
|
/**
|
|
23
18
|
* Represents a node in a tree generated by the BracketGenerator from a large list,
|
|
24
19
|
* used to restrict calculations to only the visible branches.
|
|
25
20
|
*/
|
|
26
|
-
var Bracket =
|
|
21
|
+
var Bracket = /*#__PURE__*/function (_TModel) {
|
|
27
22
|
function Bracket(parent) {
|
|
28
23
|
var _this;
|
|
29
24
|
_classCallCheck(this, Bracket);
|
|
@@ -111,7 +106,7 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
|
|
|
111
106
|
}, {
|
|
112
107
|
key: "createViewport",
|
|
113
108
|
value: function createViewport() {
|
|
114
|
-
this.viewport = this.viewport || new
|
|
109
|
+
this.viewport = this.viewport || new Viewport();
|
|
115
110
|
this.viewport.xNext = this.x;
|
|
116
111
|
this.viewport.xNorth = this.x;
|
|
117
112
|
this.viewport.xEast = this.x;
|
|
@@ -195,4 +190,5 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
|
|
|
195
190
|
return this.allChildrenList;
|
|
196
191
|
}
|
|
197
192
|
}]);
|
|
198
|
-
}(
|
|
193
|
+
}(TModel);
|
|
194
|
+
export { Bracket };
|
|
@@ -1,11 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.BracketGenerator = void 0;
|
|
7
|
-
var _Bracket = require("./Bracket.js");
|
|
8
|
-
var _App = require("./App.js");
|
|
9
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); }
|
|
10
2
|
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
11
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."); }
|
|
@@ -20,13 +12,16 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
|
|
|
20
12
|
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; }
|
|
21
13
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
22
14
|
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); }
|
|
15
|
+
import { Bracket } from "./Bracket.js";
|
|
16
|
+
import { App } from "./App.js";
|
|
17
|
+
|
|
23
18
|
/**
|
|
24
19
|
* Generates a bottom-up tree from the children of a TModel. When the number of children
|
|
25
20
|
* exceeds a defined threshold (bracketThreshold), a tree is generated to limit the process loop to only
|
|
26
21
|
* the visible branches. A TModel can opt out of tree generation completely by defining a target
|
|
27
22
|
* `shouldBeBracketed` and setting it to false.
|
|
28
23
|
*/
|
|
29
|
-
var BracketGenerator =
|
|
24
|
+
var BracketGenerator = /*#__PURE__*/function () {
|
|
30
25
|
function BracketGenerator() {
|
|
31
26
|
_classCallCheck(this, BracketGenerator);
|
|
32
27
|
}
|
|
@@ -61,7 +56,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
61
56
|
if (!parent) {
|
|
62
57
|
return;
|
|
63
58
|
}
|
|
64
|
-
if (child instanceof
|
|
59
|
+
if (child instanceof Bracket && child.parent === child.realParent) {
|
|
65
60
|
var topBrackets = BracketGenerator.bracketMap[page.oid];
|
|
66
61
|
var index = topBrackets.indexOf(child);
|
|
67
62
|
if (index >= 0) {
|
|
@@ -90,7 +85,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
90
85
|
if (bracket.allChildrenList.length === 0) {
|
|
91
86
|
return currentIndex;
|
|
92
87
|
}
|
|
93
|
-
var containsBrackets = bracket.allChildrenList[0] instanceof
|
|
88
|
+
var containsBrackets = bracket.allChildrenList[0] instanceof Bracket;
|
|
94
89
|
if (containsBrackets) {
|
|
95
90
|
bracket.startIndex = currentIndex;
|
|
96
91
|
var _iterator = _createForOfIteratorHelper(bracket.allChildrenList),
|
|
@@ -148,7 +143,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
148
143
|
bracket.currentBrakcetStatus = 2;
|
|
149
144
|
bracket.markLayoutDirty('update');
|
|
150
145
|
bracket = targetBracket.getParent();
|
|
151
|
-
while (bracket instanceof
|
|
146
|
+
while (bracket instanceof Bracket) {
|
|
152
147
|
bracket.startIndex = Math.min(bracket.startIndex, index);
|
|
153
148
|
bracket.endIndex = Math.max(bracket.endIndex, index + 1);
|
|
154
149
|
bracket.currentBrakcetStatus = 2;
|
|
@@ -215,7 +210,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
215
210
|
chunks.forEach(function (chunk) {
|
|
216
211
|
return BracketGenerator.markBracketDirty(chunk);
|
|
217
212
|
});
|
|
218
|
-
if (chunks[0].parent instanceof
|
|
213
|
+
if (chunks[0].parent instanceof Bracket) {
|
|
219
214
|
BracketGenerator.markBracketDirty(chunks[0].parent);
|
|
220
215
|
}
|
|
221
216
|
}
|
|
@@ -229,7 +224,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
229
224
|
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
|
230
225
|
var bracket = _step3.value;
|
|
231
226
|
if (bracket.startIndex <= index && bracket.endIndex >= index) {
|
|
232
|
-
if (bracket.getFirstChild() instanceof
|
|
227
|
+
if (bracket.getFirstChild() instanceof Bracket) {
|
|
233
228
|
return BracketGenerator.findOrCreateBracket(page, index, bracket.allChildrenList);
|
|
234
229
|
}
|
|
235
230
|
return bracket;
|
|
@@ -256,7 +251,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
256
251
|
var brackets = [];
|
|
257
252
|
for (var i = 0; i < length; i += bracketSize) {
|
|
258
253
|
var chunk = list.slice(i, i + bracketSize);
|
|
259
|
-
var containsBrackets = chunk[0] instanceof
|
|
254
|
+
var containsBrackets = chunk[0] instanceof Bracket;
|
|
260
255
|
var startIndex = containsBrackets ? chunk[0].startIndex : i;
|
|
261
256
|
var endIndex = containsBrackets ? chunk[chunk.length - 1].endIndex : i + chunk.length;
|
|
262
257
|
var bracket = BracketGenerator.createBracket(page, startIndex, endIndex, chunk);
|
|
@@ -267,14 +262,14 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
267
262
|
}, {
|
|
268
263
|
key: "createBracket",
|
|
269
264
|
value: function createBracket(page, startIndex, endIndex, list) {
|
|
270
|
-
var bracket = new
|
|
271
|
-
|
|
265
|
+
var bracket = new Bracket(page);
|
|
266
|
+
App.tmodelIdMap[bracket.oid] = bracket;
|
|
272
267
|
bracket.realParent = page;
|
|
273
268
|
bracket.allChildrenList = list || bracket.allChildrenList;
|
|
274
269
|
bracket.startIndex = startIndex;
|
|
275
270
|
bracket.endIndex = endIndex;
|
|
276
271
|
bracket.allChildrenList.forEach(function (child) {
|
|
277
|
-
if (child instanceof
|
|
272
|
+
if (child instanceof Bracket) {
|
|
278
273
|
child.realParent = page;
|
|
279
274
|
child.parent = bracket;
|
|
280
275
|
} else {
|
|
@@ -305,4 +300,5 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
|
|
|
305
300
|
}();
|
|
306
301
|
_defineProperty(BracketGenerator, "bracketMap", {});
|
|
307
302
|
_defineProperty(BracketGenerator, "pageMap", {});
|
|
308
|
-
_defineProperty(BracketGenerator, "all", {});
|
|
303
|
+
_defineProperty(BracketGenerator, "all", {});
|
|
304
|
+
export { BracketGenerator };
|
package/build/ColorUtil.js
CHANGED
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.ColorUtil = void 0;
|
|
7
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); }
|
|
8
2
|
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
9
3
|
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); } }
|
|
@@ -14,7 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
|
|
|
14
8
|
/**
|
|
15
9
|
* It provides utility functions for morphing colors.
|
|
16
10
|
*/
|
|
17
|
-
var ColorUtil =
|
|
11
|
+
var ColorUtil = /*#__PURE__*/function () {
|
|
18
12
|
function ColorUtil() {
|
|
19
13
|
_classCallCheck(this, ColorUtil);
|
|
20
14
|
}
|
|
@@ -182,4 +176,5 @@ _defineProperty(ColorUtil, "colors", {
|
|
|
182
176
|
whitesmoke: "#f5f5f5",
|
|
183
177
|
yellow: "#ffff00",
|
|
184
178
|
yellowgreen: "#9acd32"
|
|
185
|
-
});
|
|
179
|
+
});
|
|
180
|
+
export { ColorUtil };
|