dbm 1.1.1 → 1.1.2

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

@@ -49,6 +49,20 @@ export let createCoverScaledImageUrl = function(aImageData, aWantedWidth, aWante
     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);
+
+    return aUrl.split("{scale}").join("width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=contain");
+}
+
 export let createContainScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {
     if(!aImageData || !aImageData["url"]) {
         return null;
@@ -60,17 +74,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;