dbm 1.1.16 → 1.1.18

package/commands/TrackEvent.js

@@ -0,0 +1,18 @@
+import Dbm from "../index.js";
+import CommandBaseObject from "./CommandBaseObject.js"
+
+export default class TrackEvent extends CommandBaseObject {
+    _construct() {
+        super._construct();
+
+        this.item.setValue("eventName", null);
+        this.item.setValue("additionalData", {});
+    }
+
+    perform(aFromObject, aData) {
+		let trackingController = Dbm.getInstance().repository.getItem("trackingController").controller;
+
+        trackingController.trackEvent(this.item.eventName, this.item.additionalData);
+        
+    }
+}

package/commands/index.js

@@ -4,6 +4,7 @@ export {default as CommandBaseObject} from "./CommandBaseObject.js";
 export {default as CallFunction} from "./CallFunction.js";
 export {default as SetProperty} from "./SetProperty.js";
 export {default as ResolvePromise} from "./ResolvePromise.js";
+export {default as TrackEvent} from "./TrackEvent.js";
 
 
 export const callScopedFunction = function(aScopeObject, aFunction, aArguments = []) {
@@ -38,6 +39,14 @@ export const setProperty = function(aProperty, aValue) {
     return newCommand;
 }
 
+export const trackEvent = function(aEventName, aAdditionalData = {}) {
+    let newCommand = new Dbm.commands.TrackEvent();
+    newCommand.item.setValue("eventName", aEventName);
+    newCommand.item.setValue("additionalData", aAdditionalData);
+
+    return newCommand;
+}
+
 export const performCommands = function(aCommands, aFromObject = null, aEventData = null) {
     let currentArray = aCommands;
     let currentArrayLength = currentArray.length;

package/flow/FlowProperty.js

@@ -48,6 +48,12 @@ export default class FlowProperty extends Dbm.flow.FlowBaseObject {
         return this;
     }
 
+    addAddionalAnimation(aFromValue, aToValue, aTime = 0.5, aDelay = 0, aEasing = null) {
+        Dbm.getInstance().repository.getItem("propertyUpdater").controller.addPropertyAnimation(this, aFromValue, aToValue, aTime, aDelay, aEasing);
+
+        return this;
+    }
+
     delayValue(aToValue, aDelay = 0) {
         Dbm.getInstance().repository.getItem("propertyUpdater").controller.delayUpdateProperty(this, aToValue, aDelay);
 

package/flow/updatefunctions/dom/ElementPosition.js

@@ -24,21 +24,57 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
     start() {
 		window.addEventListener("resize", this._callback_scrollBound, false);
 		window.addEventListener("scroll", this._callback_scrollBound, false);
+		this.output.properties.prepare.startUpdating();
 
         return this;
     }
 
     _update() {
-        //console.log("_update");
+        console.log("_update");
 
         let element = this.input.element;
 
+		console.log(element, this.input.prepareX, this.input.prepareY);
+
         if(element) {
-			console.log(element);
+			
             //this.output.width = element.clientWidth;
             //this.output.height = element.clientHeight;
 			
-			//METODO
+			//let thePageXOffset = window.pageXOffset;
+			let theInnerWidth = window.innerWidth;
+			//let thePageYOffset = window.pageYOffset;
+			let theInnerHeight = window.innerHeight;
+			
+			//console.log(theInnerWidth, theInnerHeight);
+			
+			let rect = element.getBoundingClientRect();
+			//console.log(rect);
+			
+			let prepareX = this.input.prepareX;
+			let prepareY = this.input.prepareY;
+			
+			let screenX = rect.x;
+			let screenY = rect.y;
+			
+			let elementWidth = rect.width;
+			let elementHeight = rect.height;
+			
+			let visible = ((screenX < theInnerWidth) && (screenX+elementWidth > 0)) && ((screenY < theInnerHeight) && (screenY+elementHeight > 0));
+			let prepare = ((screenX-prepareX < theInnerWidth) && (screenX+elementWidth+prepareX > 0)) && ((screenY-prepareY < theInnerHeight) && (screenY+elementHeight+prepareY > 0));
+			
+			let parameterX = (screenX+elementWidth)/(theInnerWidth+elementWidth);
+			let parameterY = (screenY+elementHeight)/(theInnerHeight+elementHeight);
+			
+			this.output.screenX = screenX;
+			this.output.screenY = screenY;
+			
+			this.output.parameterX = parameterX;
+			this.output.parameterY = parameterY;
+			
+			this.output.visible = visible;
+			this.output.prepare = prepare;
+
         }
         else {
             //this.output.width = 0;
@@ -49,7 +85,7 @@ export default class ElementPosition extends Dbm.flow.FlowUpdateFunction {
     }
 
     _callback_scroll(aEvent) {
-        //console.log("_callback_scroll");
+        console.log("_callback_scroll");
 
         let element = this.input.element;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "main": "index.js",
   "type": "module",
   "scripts": {},

package/site/SiteNavigation.js

@@ -105,8 +105,10 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
         if(aEvent.defaultPrevented) {
 			return true;
 		}
+		let shouldSkip = false;
+
 		if(this._hasSpecialKey(aEvent)) {
-			return true;
+			shouldSkip = true;
 		}
 		
 		let link = null;
@@ -123,7 +125,7 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 					link = hrefAttribute.toString();
 					let hardNavigation = currentNode.getAttribute("data-not-spa-link");
 					if(hardNavigation) {
-						return true;
+						shouldSkip = true;
 					}
 					break;
 				}
@@ -134,6 +136,21 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 		if(!link) {
 			return true;
 		}
+
+		let trackingController = Dbm.getInstance().repository.getItem("trackingController").controller;
+		if(trackingController) {
+			if(link.indexOf("mailto:") === 0) {
+				trackingController.trackEvent("link / email", {});
+			}
+			else if(link.indexOf("tel:") === 0) {
+				trackingController.trackEvent("link / phone", {});
+			}
+		}
+
+		if(shouldSkip) {
+			return true;
+		}
+
 		if(link.indexOf("#") === 0) {
 			return true;
 		}

package/updater/PropertyUpdater.js

@@ -122,6 +122,26 @@ export default class PropertyUpdater extends Dbm.core.BaseObject {
         return this;
     }
 
+    addPropertyAnimation(aProperty, aFromValue, aToValue, aTime, aDelay = 0, aEasing = null) {
+
+        let tweenObject = {"envelope": aFromValue};
+        if(!aEasing) {
+            aEasing = Easing.Quadratic.Out;
+        }
+
+        let tween = new Tween(tweenObject).to({"envelope": aToValue}, 1000*aTime).delay(1000*aDelay).easing(aEasing).onUpdate(function(aData) {
+            aProperty.value = aData.envelope;
+        }).onComplete(() => {this.removeTween(tween)}).start();
+
+        let tweens = [].concat(this.item.tweens);
+        tweens.push(tween);
+        this.item.tweens = tweens;
+
+        this._currentTweens.set(aProperty, tween);
+
+        return this;
+    }
+
     delayUpdateProperty(aProperty, aToValue, aDelay = 0) {
         if(this._currentTweens.has(aProperty)) {
             this._currentTweens.get(aProperty).stop();