targetj 1.0.230 → 1.0.231

package/build/LoadingManager.js

@@ -180,7 +180,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
     key: "isLoadingComplete",
     value: function isLoadingComplete(tmodel, targetName) {
       var key = this.getTModelKey(tmodel, targetName);
-      return this.tmodelKeyMap[key] ? this.tmodelKeyMap[key].resultCount === this.tmodelKeyMap[key].entryCount && this.tmodelKeyMap[key].activeIndex === this.tmodelKeyMap[key].entryCount : false;
+      return this.tmodelKeyMap[key] ? this.tmodelKeyMap[key].resultCount === this.tmodelKeyMap[key].entryCount && this.tmodelKeyMap[key].activeIndex === this.tmodelKeyMap[key].entryCount && this.tmodelKeyMap[key].resultCount === tmodel.getTargetCycles(targetName) : false;
     }
   }, {
     key: "resetLoadingError",
@@ -211,7 +211,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
       }
       var loadTargetName = _TUtil.TUtil.getLoadTargetName(targetName);
       var targetValue = tmodel.val(loadTargetName);
-      return Array.isArray(targetValue) && _TUtil.TUtil.isDefined(targetValue[modelEntry.activeIndex]);
+      return Array.isArray(targetValue) && _TUtil.TUtil.isDefined(targetValue[modelEntry.activeIndex]) && _TUtil.TUtil.isDefined(targetValue[modelEntry.accessIndex]);
     }
   }, {
     key: "getLoadingItemValue",
@@ -230,7 +230,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           tmodelEntry.accessIndex += result.length;
         } else if (_TUtil.TUtil.isDefined(targetValue[tmodelEntry.accessIndex])) {
           result = targetValue[tmodelEntry.accessIndex];
-          tmodelEntry.accessIndex = Math.min(tmodelEntry.accessIndex + 1, tmodelEntry.entryCount - 1);
+          tmodelEntry.accessIndex = Math.min(tmodelEntry.accessIndex + 1, tmodelEntry.entryCount);
         }
       }
       return result;

package/build/TargetExecutor.js

@@ -287,11 +287,11 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
         tmodel.addChild(_child);
         TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
       } else if (_TargetParser.TargetParser.isFetchTarget(key, newValue)) {
-        (0, _App.getLoader)().fetch(tmodel, newValue);
         TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
+        (0, _App.getLoader)().fetch(tmodel, newValue);
       } else if (_TargetParser.TargetParser.isFetchImageTarget(key, newValue)) {
-        (0, _App.getLoader)().fetchImage(tmodel, newValue);
         TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
+        (0, _App.getLoader)().fetchImage(tmodel, newValue);
       } else if (_TargetParser.TargetParser.isListTarget(newValue)) {
         TargetExecutor.assignListTarget(tmodel, key, targetValue, newValue.list, newValue.list[0], newSteps, newInterval, easing, newCycles);
       } else {

package/build/TargetManager.js

@@ -78,7 +78,9 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
       tmodel.resetScheduleTimeStamp(key);
       _TargetExecutor.TargetExecutor.prepareTarget(tmodel, key);
       _TargetExecutor.TargetExecutor.executeDeclarativeTarget(tmodel, key);
-      _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, key);
+      if (!_TUtil.TUtil.isDefined(target.fetchAction)) {
+        _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, key);
+      }
     }
   }, {
     key: "setActualValues",

package/build/TargetUtil.js

@@ -123,7 +123,10 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         var originalMethod = target[method];
         var shouldWrap = method === 'value' || typeof originalMethod === 'function' && _TargetData.TargetData.isLifeCycleMethod(method);
         if (shouldWrap) {
-          target[method] = function () {
+          if (originalMethod.__isBoundTargetMethod) {
+            return;
+          }
+          var wrappedMethod = function wrappedMethod() {
             var _getPrevUpdateTime;
             if (!_TargetData.TargetData.lifecycleCoreSet.has(method)) {
               TargetUtil.currentTargetName = key;
@@ -137,6 +140,8 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
             lastPrevUpdateTime = (_getPrevUpdateTime = getPrevUpdateTime()) !== null && _getPrevUpdateTime !== void 0 ? _getPrevUpdateTime : lastPrevUpdateTime;
             return result;
           };
+          wrappedMethod.__isBoundTargetMethod = true;
+          target[method] = wrappedMethod;
         }
       });
     }