targetj 1.0.55 → 1.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "keywords": [
     "targetj"
   ],

package/src/App.js

@@ -148,6 +148,7 @@ function AppFn(firstChild) {
         my.manager.nextRuns = [];
         my.manager.runningStep = 0;
         my.manager.runningFlag = false;
+        my.manager.rerunFlag = false; 
     };
     
     my.reset = function() {

package/src/LocationManager.js

@@ -138,11 +138,11 @@ LocationManager.prototype.calculateContainer = function(container) {
 };
 
 LocationManager.prototype.calculateTargets = function(tmodel) { 
-    tapp.targetManager.setTargetValues(tmodel, Object.keys(tmodel.activeTargetKeyMap));        
+    tapp.targetManager.setTargetValues(tmodel, Object.keys(tmodel.activeTargetMap));        
     tapp.targetManager.setActualValues(tmodel);
 
-    if ((!TUtil.isDefined(tmodel.targetValues.width) || tmodel.targetValues.widthFromDom) && tmodel.hasDom()) TargetUtil.setWidthFromDom(tmodel);
-    if ((!TUtil.isDefined(tmodel.targetValues.height) || tmodel.targetValues.heightFromDom) && tmodel.hasDom()) TargetUtil.setHeightFromDom(tmodel);
+    if ((!TUtil.isDefined(tmodel.targetValues.width) || tmodel.getTargetValue('widthFromDom')) && tmodel.hasDom()) TargetUtil.setWidthFromDom(tmodel);
+    if ((!TUtil.isDefined(tmodel.targetValues.height) || tmodel.getTargetValue('heightFromDom')) && tmodel.hasDom()) TargetUtil.setHeightFromDom(tmodel);
 };
 
 LocationManager.prototype.addToLocationList = function(child)   {

package/src/TModel.js

@@ -15,7 +15,7 @@ function TModel(type, targets) {
 
     this.type = type ? type : 'blank';
     this.targets = Object.assign({}, targets);
-    this.activeTargetKeyMap = {};
+    this.activeTargetMap = {};
     this.resetActiveTargetMap();
     
     var uniqueId = App.getOid(this.type);
@@ -114,9 +114,9 @@ TModel.prototype.getDomHolder = function() {
 TModel.prototype.resetActiveTargetMap = function() {
     var self = this;
     this.targetValues = {};
-    this.activeTargetKeyMap = {};
+    this.activeTargetMap = {};
     Object.keys(this.targets).forEach(function(key) {
-        self.activeTargetKeyMap[key] = true;
+        self.activeTargetMap[key] = true;
     });    
 };
 
@@ -727,7 +727,7 @@ TModel.prototype.setTargetValue = function(key, value, steps, stepInterval, cycl
         TargetUtil.handleValueChange(this, key, this.actualValues[key], oldValue, 0, 0); 
     }
     
-    this.activeTargetKeyMap[key] = true;
+    this.activeTargetMap[key] = true;
     this.targetValues[key].executionCount++; 
 
     this.updateTargetStatus(key);
@@ -772,13 +772,13 @@ TModel.prototype.removeUpdatingChild = function(child) {
 
 TModel.prototype.removeTarget = function(key) {
     delete this.targets[key];
-    delete this.activeTargetKeyMap[key];
+    delete this.activeTargetMap[key];
     delete this.targetValues[key]; 
 };
 
 TModel.prototype.addTarget = function(key, target) {
     this.targets[key] = target;
-    this.activeTargetKeyMap[key] = true;
+    this.activeTargetMap[key] = true;
     delete this.targetValues[key];
             
     tapp.manager.scheduleRun(10, 'addTarget-' + this.oid + "-" + key);
@@ -793,7 +793,7 @@ TModel.prototype.addTargets = function(targets) {
 
 TModel.prototype.deleteTargetValue = function(key)   {
     delete this.targetValues[key];
-    this.activeTargetKeyMap[key] = true;
+    this.activeTargetMap[key] = true;
 
     tapp.manager.scheduleRun(10, 'deleteTargetValue-' + this.oid + "-" + key);    
 };

package/src/TModelManager.js

@@ -14,7 +14,8 @@ TModelManager.prototype.init = function()   {
         deletedTModel: [],
         visibleNoDom: [],
         updatingTModels: [],
-        updatingTargets: []
+        updatingTargets: [],
+        activeTargets: []
     };
     this.visibleTypeMap = {};
     this.visibleOidMap = {};
@@ -23,6 +24,7 @@ TModelManager.prototype.init = function()   {
     this.nextRuns = [];
     this.runningStep = 0;
     this.runningFlag = false;
+    this.rerunFlag = false;
 };
  
 TModelManager.prototype.visibles = function(type, list) {
@@ -47,6 +49,7 @@ TModelManager.prototype.analyze = function()    {
     this.lists.visibleNoDom.length = 0;
     this.lists.updatingTModels.length = 0;
     this.lists.updatingTargets.length = 0;
+    this.lists.activeTargets.length = 0;
     this.visibleTypeMap = {};
     this.visibleOidMap = {};
     this.targetMethodMap = {};
@@ -72,6 +75,11 @@ TModelManager.prototype.analyze = function()    {
                 this.lists.updatingTModels.push(tmodel);
                 this.lists.updatingTargets = this.lists.updatingTargets.concat((tmodel.targetUpdatingList));
             }
+            
+            var activeTargets = Object.keys(tmodel.activeTargetMap);
+            if (activeTargets.length > 0) {
+                this.lists.activeTargets = this.lists.activeTargets.concat("'" + tmodel.oid + "'", activeTargets);
+            }
                         
             if (Object.keys(tmodel.targetMethodMap).length > 0) {                  
                 this.targetMethodMap[tmodel.oid] = Object.assign({}, tmodel.targetMethodMap);
@@ -147,7 +155,7 @@ TModelManager.prototype.deleteDoms = function () {
                 var key = invisible.key;
                 invisible.fn.call(tmodel, key, tmodel.getTargetStep(key), tmodel.getTargetCycle(key), tmodel.getTargetSteps(key), tmodel.getTargetCycles(key));
                 tmodel.setTargetMethodName(key, 'onInvisible');
-                tmodel.activeTargetKeyMap[key] = true;
+                tmodel.activeTargetMap[key] = true;
             });
         }
         
@@ -295,6 +303,8 @@ TModelManager.prototype.scheduleRun = function(delay, oid) {
         var lastRun = this.nextRuns.length > 0 ? this.nextRuns[this.nextRuns.length - 1] : null;
         if (nextRun && (!lastRun || nextRun.delay > lastRun.delay)) {
             this.nextRuns.push(nextRun);
+        } else if (nextRun && lastRun && nextRun.delay <= lastRun.delay) {
+            tapp.manager.rerunFlag = true;
         }
     }
 };
@@ -390,6 +400,10 @@ TModelManager.prototype.run = function(oid, delay) {
 
         if (tapp.manager.runningStep !== 7)  {
             tapp.manager.run("rendering: " + tapp.manager.runningStep);
+        } else if (tapp.manager.rerunFlag) {
+            tapp.manager.runningStep = 0;
+            tapp.manager.rerunFlag = false;
+            tapp.manager.run("rerun");
         } else {
            tapp.manager.runningStep = 0;
                               

package/src/TargetManager.js

@@ -32,7 +32,7 @@ TargetManager.prototype.setTargetValues = function(tmodel, activeKeys) {
         if (tmodel.isTargetDone(key)) {
             this.doneTargets.push({ tmodel: tmodel, key: key });
         } else if (tmodel.isTargetComplete(key)) {
-            delete tmodel.activeTargetKeyMap[key];
+            delete tmodel.activeTargetMap[key];
         } else {
             this.setTargetValue(tmodel, key);
             tmodel.updateTargetStatus(key);
@@ -54,7 +54,7 @@ TargetManager.prototype.setTargetValue = function(tmodel, key) {
     var target = tmodel.targets[key];
     
     if (!TUtil.isDefined(target)) {
-        delete tmodel.activeTargetKeyMap[key];        
+        delete tmodel.activeTargetMap[key];        
         return;
     }
 
@@ -65,10 +65,13 @@ TargetManager.prototype.setTargetValue = function(tmodel, key) {
         }
         
         if (!TUtil.isDefined(tmodel.getScheduleTimeStamp(key))) {
-            TargetUtil.assignValueArray(tmodel, key); 
+            var newChange = TargetUtil.assignValueArray(tmodel, key);
+            if (!newChange) {
+                tmodel.targetValues[key].executionCount++;
+            }
             tmodel.setTargetMethodName(key, 'value');
         }
-        
+                    
         var schedulePeriod = TargetUtil.scheduleExecution(tmodel, key);
         if (schedulePeriod > 0) {
             tapp.manager.scheduleRun(schedulePeriod, "actualInterval__" + tmodel.oid + "__" + key); 

package/src/TargetUtil.js

@@ -115,9 +115,9 @@ TargetUtil.assignValueArray = function(tmodel, key) {
                 tmodel.resetTargetStep(key);
                 tmodel.resetLastActualValue(key);
             }
-        } else {
-            tmodel.targetValues[key].executionCount++; 
-        }
+            
+            return true;
+        } 
     }
 };
 

package/webpack.config.js

@@ -7,7 +7,7 @@ module.exports = {
       name: 'TargetJ',
       type: 'window'
     },
-    path: path.resolve(__dirname, '../targetj/jslib'),
+    path: path.resolve(__dirname, './dist'),
     filename: 'targetj.js'
   }
 };