targetj 1.0.49 → 1.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.49",
+  "version": "1.0.50",
   "keywords": [
     "targetj"
   ],

package/src/App.js

@@ -110,7 +110,8 @@ function AppFn(uiFactory, rootId) {
         my.manager.lists.deletedTModel.length = 0; 
         my.manager.lists.visibleNoDom.length = 0;
         my.manager.visibleTypeMap = {};
-        my.manager.visibleOidMap = {}; 
+        my.manager.visibleOidMap = {};
+        my.manager.targetExecuteMap = {};
         my.locationManager.hasLocationList.length = 0;
         SearchUtil.foundParentWithTarget = {};
         SearchUtil.foundTypeMap = {};

package/src/Bracket.js

@@ -11,21 +11,9 @@ function Bracket(parent) {
     
     tm.targets = {
         canHaveDom: false,
-        innerXEast: {
-            loop: true,
-            value: function() {
-                return TUtil.isDefined(tm.getRealParent().getValue('innerXEast')) ? tm.getRealParent().getValue('innerXEast') : tm.getRealParent().absX + tm.getRealParent().getWidth();
-            }
-        },
-        xOverflow: {
-            loop: true,
-            value: function() { 
-                return this.getRealParent().getX();
-            }
-        },
         outerXEast: 0
     };
-
+    
     tm.getWidth = function()    {
         return this.getContentWidth();
     };
@@ -38,6 +26,10 @@ function Bracket(parent) {
         return this.innerContentWidth;
     };
     
+    tm.getInnerXEast = function() {
+        return TUtil.isDefined(tm.getRealParent().getValue('innerXEast')) ? this.getRealParent().getValue('innerXEast') : this.getRealParent().absX + this.getRealParent().getWidth();        
+    };
+    
     tm.getInnerContentHeight = function() {
         return this.innerContentHeight;
     };

package/src/LocationManager.js

@@ -74,8 +74,8 @@ LocationManager.prototype.calculateContainer = function(container) {
         viewport.setCurrentChild(child);  
         child.setLocation(viewport);
         
-        innerXEast = TUtil.isDefined(container.getValue('innerXEast')) ? container.getValue('innerXEast') : container.absX + container.getInnerWidth();
-        outerXEast = TUtil.isDefined(child.getValue('outerXEast')) ? child.getValue('outerXEast') : child.absX + child.getInnerWidth();
+        innerXEast = TUtil.isDefined(container.getValue('innerXEast')) ? container.getValue('innerXEast') : container.getInnerXEast();
+        outerXEast = TUtil.isDefined(child.getValue('outerXEast')) ? child.getValue('outerXEast') : child.getOuterXEast();
         
         if (viewport.isOverflow(outerXEast, innerXEast)) {   
             viewport.overflow();                       

package/src/TModel.js

@@ -60,6 +60,8 @@ function TModel(type, targets) {
     this.targetUpdatingMap = {};
     this.targetUpdatingList = [];
     
+    this.targetExecuteMap = {};
+    
     this.updatingChildren = [];
        
     this.targetLastUpdateMap = {};
@@ -226,6 +228,14 @@ TModel.prototype.getInnerWidth = function()  {
     return TUtil.isDefined(this.actualValues.innerWidth) ? this.actualValues.innerWidth : this.getWidth();
 };
 
+TModel.prototype.getInnerXEast = function()  {
+    return this.absX + this.getInnerWidth();
+};
+
+TModel.prototype.getOuterXEast = function()  {
+    return this.absX + this.getInnerWidth();
+};
+
 TModel.prototype.getContentWidth = function()  {
     return this.contentWidth;
 };
@@ -736,12 +746,18 @@ TModel.prototype.removeUpdatingChild = function(child) {
     }
 };
 
-TModel.prototype.addTarget = function(targetName, target) {
-    this.targets[targetName] = target;
-    this.activeTargetKeyMap[targetName] = true;
-    delete this.targetValues[targetName];
+TModel.prototype.removeTarget = function(key) {
+    delete this.targets[key];
+    delete this.activeTargetKeyMap[key];
+    delete this.targetValues[key]; 
+};
+
+TModel.prototype.addTarget = function(key, target) {
+    this.targets[key] = target;
+    this.activeTargetKeyMap[key] = true;
+    delete this.targetValues[key];
             
-    tapp.manager.scheduleRun(10, 'addTarget-' + this.oid + "-" + targetName);
+    tapp.manager.scheduleRun(10, 'addTarget-' + this.oid + "-" + key);
 };
 
 TModel.prototype.addTargets = function(targets) {

package/src/TModelManager.js

@@ -18,6 +18,7 @@ TModelManager.prototype.init = function()   {
     };
     this.visibleTypeMap = {};
     this.visibleOidMap = {};
+    this.targetExecuteMap = {};
             
     this.nextRuns = [];
     this.runningStep = 0;
@@ -48,6 +49,7 @@ TModelManager.prototype.analyze = function()    {
     this.lists.updatingTargets.length = 0;
     this.visibleTypeMap = {};
     this.visibleOidMap = {};
+    this.targetExecuteMap = {};
     
     for (i = 0; i < tapp.locationManager.hasLocationList.length; i++) {
         tmodel = tapp.locationManager.hasLocationList[i];
@@ -66,6 +68,10 @@ TModelManager.prototype.analyze = function()    {
                 this.lists.updatingTModels.push(tmodel);
                 this.lists.updatingTargets = this.lists.updatingTargets.concat((tmodel.targetUpdatingList));
             }
+                        
+            if (Object.keys(tmodel.targetExecuteMap).length > 0) {                  
+                this.targetExecuteMap[tmodel.oid] = Object.assign({}, tmodel.targetExecuteMap);
+            }
             
             this.visibleOidMap[tmodel.oid] = tmodel;
             if (!this.visibleTypeMap[tmodel.type]) {
@@ -136,6 +142,7 @@ TModelManager.prototype.deleteDoms = function () {
             tmodel.invisibleFunctions.forEach(function(invisible)  {
                 var key = invisible.key;
                 invisible.fn.call(tmodel, key, tmodel.getTargetStep(key), tmodel.getTargetCycle(key), tmodel.getTargetSteps(key), tmodel.getTargetCycles(key));
+                tmodel.targetExecuteMap[key] = 'onInvisible';
                 tmodel.activeTargetKeyMap[key] = true;
             });
         }

package/src/TargetManager.js

@@ -31,12 +31,13 @@ TargetManager.prototype.setTargetValues = function(tmodel) {
                     
     tmodel.targetUpdatingMap = {};
     tmodel.targetUpdatingList = [];
+    tmodel.targetExecuteMap = {};
                     
     for (var i = 0; i < activeKeys.length; i++) {
        
         var key = activeKeys[i];
                                 
-        if (tmodel.targetUpdatingMap[key]) {
+        if (tmodel.targetUpdatingMap[key]) {            
             continue;
         }   
         
@@ -47,7 +48,7 @@ TargetManager.prototype.setTargetValues = function(tmodel) {
         }
         
         var result = this.setTargetValue(tmodel, key);
-
+        
         if (result) {
             tmodel.targetUpdatingMap[key] = true;
             tmodel.targetUpdatingList.push(key);  
@@ -79,15 +80,18 @@ TargetManager.prototype.setTargetValue = function(tmodel, key, force) {
                 var cycle = tmodel.getTargetCycle(key);
                 var valueArray = TargetUtil.getValueStepsCycles(tmodel, target, cycle, valueOnly, key);               
                 TargetUtil.assignValueArray(tmodel, key, valueArray);
+                 
+                if (!force) {
+                    tmodel.targetExecuteMap[key] = 'value';
+                }
             }
-
+            
             if (tmodel.isTargetInLoop(key) 
-                    || !tmodel.isTargetDone(key) 
-                    || !tmodel.isTargetComplete(key) 
+                    || (!tmodel.isTargetDone(key) && !tmodel.isTargetComplete(key))
                     || TUtil.isDefined(tmodel.getActualTimeStamp(key))
                     || !tmodel.hasTargetGotExecuted(key)) {
                 tmodel.activeTargetKeyMap[key] = true;
-            } else if (tmodel.activeTargetKeyMap[key]) {
+            } else if (tmodel.activeTargetKeyMap[key]) { 
                 delete tmodel.activeTargetKeyMap[key];
             }
             
@@ -100,6 +104,7 @@ TargetManager.prototype.setTargetValue = function(tmodel, key, force) {
             
             return (!tmodel.isTargetDone(key) && !tmodel.isTargetComplete(key)) || !tmodel.doesTargetEqualActual(key);
         } else {
+            tmodel.targetExecuteMap[key] = 'enabledOn';
             tmodel.activeTargetKeyMap[key] = true;
         }
     } else if (tmodel.activeTargetKeyMap[key]) {
@@ -115,7 +120,7 @@ TargetManager.prototype.setActualValues = function(tmodel)  {
                                 
     for (i = 0; i < tmodel.targetUpdatingList.length; i++) {
         key = tmodel.targetUpdatingList[i];
-                
+
         target = tmodel.targets[key];
         var status = tmodel.getTargetStatus(key);
                
@@ -130,7 +135,7 @@ TargetManager.prototype.setActualValues = function(tmodel)  {
              
     for (i = 0; i < keys.length; i++) {
         key = keys[i];
-        
+         
         var schedulePeriod = TargetUtil.getActualSchedulePeriod(tmodel, key, tmodel.getTargetStepInterval(key));
         if (schedulePeriod === 0 || !TUtil.isDefined(schedulePeriod)) {
             this.setActualValue(tmodel, key);            
@@ -181,6 +186,8 @@ TargetManager.prototype.setActualValue = function(tmodel, key) {
     var lastUpdate = tmodel.getActualValueLastUpdate(key);
     var oldValue = tmodel.actualValues[key], oldStep = step, oldCycle = cycle;
     var now = browser.now();
+   
+    tmodel.targetExecuteMap[key] = 'value';
        
     if (step < steps) { 
         if (!TUtil.isDefined(tmodel.getLastActualValue(key))) {
@@ -205,7 +212,8 @@ TargetManager.prototype.setActualValue = function(tmodel, key) {
         tmodel.setActualValueLastUpdate(key);
                 
         if (typeof tmodel.targets[key] === 'object' && typeof tmodel.targets[key].onStepsEnd === 'function') {
-            tmodel.targets[key].onStepsEnd.call(tmodel, key, cycle);
+            tmodel.targets[key].onStepsEnd.call(tmodel, key, cycle);                      
+            tmodel.targetExecuteMap[key] = 'onStepsEnd';
         }
         
         tmodel.updateTargetStatus(key);        

package/src/TargetUtil.js

@@ -189,7 +189,8 @@ TargetUtil.handleValueChange = function(tmodel, key, newValue, lastValue, step,
     if (typeof tmodel.targets[key] === 'object' && typeof tmodel.targets[key].onValueChange === 'function') {
         var valueChanged = !TUtil.areEqual(newValue, lastValue, tmodel.targets[key].deepEquality);
         if (valueChanged) {
-            tmodel.targets[key].onValueChange.call(tmodel, key, newValue, lastValue, cycle);     
+            tmodel.targets[key].onValueChange.call(tmodel, key, newValue, lastValue, cycle); 
+            tmodel.targetExecuteMap[key] = 'onValueChange';
         }
     }    
 };

package/src/Viewport.js

@@ -41,7 +41,7 @@ Viewport.prototype.reset = function() {
         this.xSouth = x;
         this.xWest = x;
         
-        this.xOverflow = TUtil.isDefined(this.tmodel.getValue('xOverflow')) ? this.tmodel.getValue('xOverflow') : x;
+        this.xOverflow = this.tmodel.getRealParent().getX();
 
         this.yNext = y;
         this.yNorth = y;