dbm 1.1.1 → 1.1.3

package/site/SiteDataLoader.js

@@ -29,12 +29,9 @@ export default class SiteDataLoader extends Dbm.core.BaseObject {
 			let graphApi = Dbm.getInstance().repository.getItem("graphApi").controller;
 			let request = graphApi.requestUrl(pathName);
 
-			let urlUpdate = new Dbm.flow.updatefunctions.basic.RunCommand();
-			urlUpdate.input.properties.value.connectInput(request.properties.status);
-			urlUpdate.input.command = Dbm.commands.callFunction(this._pageDataLoaded.bind(this), [pageData, request]);
-
 			this.item.setValue("status", 2);
-			urlUpdate.output.properties.value.startUpdating();
+			Dbm.flow.addUpdateCommandWhenMatched(request.properties.status, 1, Dbm.commands.callFunction(this._pageDataLoaded.bind(this), [pageData, request]))
+
 		}
 		else {
 			this.item.currentPage = null;
@@ -46,17 +43,16 @@ export default class SiteDataLoader extends Dbm.core.BaseObject {
 		//console.log("_pageDataLoaded");
 		//console.log(aPageData, aRequest, aRequest.status);
 
-		if(aRequest.status === 1) {
-			aPageData.setValue("page", aRequest.item);
-			aPageData.setValue("canRender", true);
+		aPageData.setValue("page", aRequest.item);
+		aPageData.setValue("canRender", true);
 
-			if(this.item.url === aPageData.url) {
-				this.item.currentPage = aPageData;
-				this.item.setValue("status", 1);
-			}
+		if(this.item.url === aPageData.url) {
+			this.item.currentPage = aPageData;
+			this.item.setValue("status", 1);
 
-			//METODO: remove updaters
 		}
+
+		//METODO: remove updaters
 		
 	}
 }

package/site/SiteNavigation.js

@@ -151,7 +151,6 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 		aEvent.preventDefault();
 		
 		this._internalNavigation(finalUrl.href);
-		window.scrollTo(0, 0);
 		
 		return false;
     }
@@ -163,15 +162,6 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 		
 		this.item.travelPaths = paths;
 	}
-	
-	_trackPage(aUrl) {
-		//console.log("_trackPage");
-		
-		let trackingController = Dbm.getInstance().repository.getItem("trackingController").controller;
-		if(trackingController) {
-			trackingController.trackPage(aUrl);
-		}
-	}
 
     _internalNavigation(aUrl) {
 		
@@ -185,8 +175,6 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 		history.pushState({}, "Page", aUrl);
 		this.item.url = aUrl;
 		
-		this._trackPage(aUrl);
-		
 		this._addUrlToPath(aUrl);
 	}
 
@@ -196,8 +184,6 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 		let url = document.location.href;
 		this.item.url = url;
 		
-		this._trackPage(url);
-		
 		let paths = [].concat(this.item.travelPaths);
 		paths.pop();
 		this.item.travelPaths = paths;
@@ -209,7 +195,6 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 		
 		if(this.item.active && originalUrl.hostname === finalUrl.hostname && this._shouldHandle(finalUrl.href)) {
 			this._internalNavigation(finalUrl.href);
-			window.scrollTo(0, 0);
 		}
 		else {
 			document.location.href = aUrl;

package/site/index.js

@@ -1,2 +1,21 @@
+import Dbm from "../index.js";
+
 export {default as SiteNavigation} from "./SiteNavigation.js";
-export {default as SiteDataLoader} from "./SiteDataLoader.js";
+export {default as SiteDataLoader} from "./SiteDataLoader.js";
+export {default as BrowserUpdater} from "./BrowserUpdater.js";
+
+export const setupAndStart = function(aTitleSuffix) {
+    let siteNavigation = new Dbm.site.SiteNavigation();
+    siteNavigation.item.register("siteNavigation");
+    siteNavigation.start();
+    siteNavigation.setUrlFromLocation();
+
+    let siteDataLoader = new Dbm.site.SiteDataLoader();
+    siteDataLoader.item.register("siteDataLoader");
+    siteDataLoader.item.properties.url.connectInput(siteNavigation.item.properties.url);
+
+    let browserUpdater = new Dbm.site.BrowserUpdater();
+    siteDataLoader.item.register("site/browserUpdater");
+    browserUpdater.setTitleSuffix(aTitleSuffix);
+    browserUpdater.item.propertyInput("pageData", siteDataLoader.item.properties.currentPage);
+}

package/utils/ArrayFunctions.js

@@ -125,7 +125,6 @@ export const filterByField = function(aArray, aField, aValue) {
     for(let i = 0; i < currentArrayLength; i++) {
         let currentItem = aArray[i];
         let currentValue = Dbm.objectPath(aArray[i], aField);
-        console.log(currentValue, aValue);
         if(currentValue === aValue) {
             returnArray.push(currentItem);
         }

package/utils/UrlFunctions.js

@@ -16,7 +16,15 @@ export let createScaledImageUrl = function(aImageData, aWantedWidth) {
                 100*Math.round(window.devicePixelRatio*window.innerWidth/100)
             )
         );
-        url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth);
+
+        let scaleString =  "width=" + scaleToWidth;
+
+        let format = "webp";
+        if(format) {
+            scaleString += ",format=" + format;
+        }
+
+        url = aImageData["resizeUrl"].split("{scale}").join(scaleString);
     }
 
     return url;
@@ -43,12 +51,40 @@ export let createCoverScaledImageUrl = function(aImageData, aWantedWidth, aWante
 
         let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
 
-        url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=cover");
+        let scaleString = "width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=cover";
+
+        let format = "webp";
+        if(format) {
+            scaleString += ",format=" + format;
+        }
+
+        url = aImageData["resizeUrl"].split("{scale}").join(scaleString);
     }
 
     return url;
 }
 
+export const getContainScaledImageUrl = function(aUrl, aWantedWidth, aWantedHeight) {
+    let scaleToWidth = Math.min(
+        Math.round(window.devicePixelRatio*aWantedWidth),
+        Math.max(
+            100,
+            100*Math.round(window.devicePixelRatio*window.innerWidth/100)
+        )
+    );
+
+    let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
+
+    let scaleString = "width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=contain";
+
+    let format = "webp";
+    if(format) {
+        scaleString += ",format=" + format;
+    }
+
+    return aUrl.split("{scale}").join(scaleString);
+}
+
 export let createContainScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {
     if(!aImageData || !aImageData["url"]) {
         return null;
@@ -60,17 +96,7 @@ export let createContainScaledImageUrl = function(aImageData, aWantedWidth, aWan
     }
 
     if(aImageData["resizeUrl"]) {
-        let scaleToWidth = Math.min(
-            Math.round(window.devicePixelRatio*aWantedWidth),
-            Math.max(
-                100,
-                100*Math.round(window.devicePixelRatio*window.innerWidth/100)
-            )
-        );
-
-        let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
-
-        url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=contain");
+        url = getContainScaledImageUrl(aImageData["resizeUrl"], aWantedWidth, aWantedHeight);
     }
 
     return url;