DOM Mapper (replacing the regular html mapper)

Viewer/src/configuration/loader.ts

@@ -13,7 +13,8 @@ export class ConfigurationLoader {
 
         if (loadedConfig.defaultViewer) {
             loadedConfig = merge(loadedConfig, defaultConfiguration);
-            return Promise.resolve(loadedConfig);
+        } else {
+            loadedConfig = merge(defaultConfiguration, loadedConfig);
         }
 
         if (loadedConfig.configuration) {
@@ -37,7 +38,7 @@ export class ConfigurationLoader {
                 return merge(loadedConfig, parsed);
             });
         } else {
-            return Promise.resolve(initConfig);
+            return Promise.resolve(loadedConfig);
         }
     }
 

Viewer/src/configuration/mappers.ts

@@ -3,6 +3,8 @@ import { ViewerConfiguration } from './configuration';
 
 import { kebabToCamel } from '../helper';
 
+import * as merge from 'lodash.merge';
+
 export interface IMapper {
     map(rawSource: any): ViewerConfiguration;
 }
@@ -39,7 +41,44 @@ class JSONMapper implements IMapper {
 }
 
 // TODO - Dom configuration mapper.
-class DOMMapper {
+class DOMMapper implements IMapper {
+
+    map(baseElement: HTMLElement): ViewerConfiguration {
+        let htmlMapper = new HTMLMapper();
+        let config = htmlMapper.map(baseElement);
+
+        let traverseChildren = function (element: HTMLElement, partConfig) {
+            let children = element.children;
+            if (children.length) {
+                for (let i = 0; i < children.length; ++i) {
+                    let item = <HTMLElement>children.item(i);
+                    let key = kebabToCamel(item.nodeName.toLowerCase());
+                    if (item.attributes.getNamedItem('array') && item.attributes.getNamedItem('array').nodeValue === 'true') {
+                        partConfig[key] = [];
+                    } else {
+                        let configMapped = htmlMapper.map(item);
+                        if (element.attributes.getNamedItem('array') && element.attributes.getNamedItem('array').nodeValue === 'true') {
+                            partConfig.push(configMapped)
+                        } else if (partConfig[key]) {
+                            //exists already! problem... probably an array
+                            element.setAttribute('array', 'true');
+                            let oldItem = partConfig[key];
+                            partConfig = [oldItem, configMapped]
+                        } else {
+                            partConfig[key] = configMapped;
+                        }
+                    }
+                    traverseChildren(item, partConfig[key]);
+                }
+            }
+            return partConfig;
+        }
+
+        traverseChildren(baseElement, config);
+
+
+        return config;
+    }
 
 }
 
@@ -51,7 +90,8 @@ export class MapperManager {
     constructor() {
         this.mappers = {
             "html": new HTMLMapper(),
-            "json": new JSONMapper()
+            "json": new JSONMapper(),
+            "dom": new DOMMapper()
         }
     }
 

Viewer/src/initializer.ts

@@ -7,7 +7,7 @@ export function InitTags(selector: string = 'babylon') {
         let element: HTMLElement = <HTMLElement>elements.item(i);
 
         // get the html configuration
-        let configMapper = mapperManager.getMapper('html');
+        let configMapper = mapperManager.getMapper('dom');
         let config = configMapper.map(element);
 
         let viewer = new DefaultViewer(element, config);