updating dist and package.json

Viewer/dist/viewer.js

@@ -77808,6 +77808,171 @@ module.exports = g;
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var babylonjs_1 = __webpack_require__(0);
+var helper_1 = __webpack_require__(3);
+var HTMLMapper = (function () {
+    function HTMLMapper() {
+    }
+    HTMLMapper.prototype.map = function (element) {
+        var config = {};
+        var _loop_1 = function (attrIdx) {
+            var attr = element.attributes.item(attrIdx);
+            var split = attr.nodeName.split('.');
+            split.reduce(function (currentConfig, key, idx) {
+                var camelKey = helper_1.kebabToCamel(key);
+                if (idx === split.length - 1) {
+                    var val = attr.nodeValue;
+                    if (val === "true") {
+                        val = true;
+                    }
+                    else if (val === "false") {
+                        val = false;
+                    }
+                    else {
+                        var number = parseFloat(val);
+                        if (!isNaN(number)) {
+                            val = number;
+                        }
+                    }
+                    currentConfig[camelKey] = val;
+                }
+                else {
+                    currentConfig[camelKey] = currentConfig[camelKey] || {};
+                }
+                return currentConfig[camelKey];
+            }, config);
+        };
+        for (var attrIdx = 0; attrIdx < element.attributes.length; ++attrIdx) {
+            _loop_1(attrIdx);
+        }
+        return config;
+    };
+    return HTMLMapper;
+}());
+var JSONMapper = (function () {
+    function JSONMapper() {
+    }
+    JSONMapper.prototype.map = function (rawSource) {
+        return JSON.parse(rawSource);
+    };
+    return JSONMapper;
+}());
+var DOMMapper = (function () {
+    function DOMMapper() {
+    }
+    DOMMapper.prototype.map = function (baseElement) {
+        var htmlMapper = new HTMLMapper();
+        var config = htmlMapper.map(baseElement);
+        var traverseChildren = function (element, partConfig) {
+            var children = element.children;
+            if (children.length) {
+                for (var i = 0; i < children.length; ++i) {
+                    var item = children.item(i);
+                    var configMapped = htmlMapper.map(item);
+                    var key = helper_1.kebabToCamel(item.nodeName.toLowerCase());
+                    if (item.attributes.getNamedItem('array') && item.attributes.getNamedItem('array').nodeValue === 'true') {
+                        partConfig[key] = [];
+                    }
+                    else {
+                        if (element.attributes.getNamedItem('array') && element.attributes.getNamedItem('array').nodeValue === 'true') {
+                            partConfig.push(configMapped);
+                        }
+                        else if (partConfig[key]) {
+                            element.setAttribute('array', 'true');
+                            var oldItem = partConfig[key];
+                            partConfig = [oldItem, configMapped];
+                        }
+                        else {
+                            partConfig[key] = configMapped;
+                        }
+                    }
+                    traverseChildren(item, partConfig[key] || configMapped);
+                }
+            }
+            return partConfig;
+        };
+        traverseChildren(baseElement, config);
+        return config;
+    };
+    return DOMMapper;
+}());
+var MapperManager = (function () {
+    function MapperManager() {
+        this.mappers = {
+            "html": new HTMLMapper(),
+            "json": new JSONMapper(),
+            "dom": new DOMMapper()
+        };
+    }
+    MapperManager.prototype.getMapper = function (type) {
+        if (!this.mappers[type]) {
+            babylonjs_1.Tools.Error("No mapper defined for " + type);
+        }
+        return this.mappers[type] || this.mappers[MapperManager.DefaultMapper];
+    };
+    MapperManager.prototype.registerMapper = function (type, mapper) {
+        this.mappers[type] = mapper;
+    };
+    MapperManager.DefaultMapper = 'json';
+    return MapperManager;
+}());
+exports.MapperManager = MapperManager;
+exports.mapperManager = new MapperManager();
+exports.default = exports.mapperManager;
+
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function isUrl(urlToCheck) {
+    if (urlToCheck.indexOf('http') === 0 || urlToCheck.indexOf('/') === 0 || urlToCheck.indexOf('./') === 0 || urlToCheck.indexOf('../') === 0) {
+        return true;
+    }
+    return false;
+}
+exports.isUrl = isUrl;
+function loadFile(url) {
+    return new Promise(function (resolve, reject) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', url);
+        xhr.send();
+        xhr.onreadystatechange = function () {
+            var DONE = 4;
+            var OK = 200;
+            if (xhr.readyState === DONE) {
+                if (xhr.status === OK) {
+                    resolve(xhr.responseText);
+                }
+            }
+            else {
+                console.log('Error: ' + xhr.status, url);
+                reject('Error: ' + xhr.status);
+            }
+        };
+    });
+}
+exports.loadFile = loadFile;
+function kebabToCamel(s) {
+    return s.replace(/(\-\w)/g, function (m) { return m[1].toUpperCase(); });
+}
+exports.kebabToCamel = kebabToCamel;
+function camelToKebab(str) {
+    return !str ? null : str.replace(/([A-Z])/g, function (g) { return '-' + g[0].toLowerCase(); });
+}
+exports.camelToKebab = camelToKebab;
+
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var babylonjs_1 = __webpack_require__(0);
 var ViewerManager = (function () {
     function ViewerManager() {
         this.viewers = {};
@@ -77830,6 +77995,10 @@ var ViewerManager = (function () {
     ViewerManager.prototype.getViewerPromiseById = function (id) {
         var _this = this;
         return new Promise(function (resolve, reject) {
+            var localViewer = _this.getViewerById(id);
+            if (localViewer) {
+                return resolve(localViewer);
+            }
             var viewerFunction = function (viewer) {
                 if (viewer.getBaseId() === id) {
                     resolve(viewer);
@@ -77849,7 +78018,7 @@ exports.viewerManager = new ViewerManager();
 
 
 /***/ }),
-/* 3 */
+/* 5 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77865,7 +78034,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var viewer_1 = __webpack_require__(4);
+var viewer_1 = __webpack_require__(6);
 var babylonjs_1 = __webpack_require__(0);
 var BABYLON = __webpack_require__(0);
 window['BABYLON'] = BABYLON;
@@ -78248,13 +78417,13 @@ exports.DefaultViewer = DefaultViewer;
 
 
 /***/ }),
-/* 4 */
+/* 6 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var viewerManager_1 = __webpack_require__(2);
+var viewerManager_1 = __webpack_require__(4);
 var templateManager_1 = __webpack_require__(17);
 var loader_1 = __webpack_require__(19);
 var babylonjs_1 = __webpack_require__(0);
@@ -78377,171 +78546,6 @@ exports.AbstractViewer = AbstractViewer;
 
 
 /***/ }),
-/* 5 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-function isUrl(urlToCheck) {
-    if (urlToCheck.indexOf('http') === 0 || urlToCheck.indexOf('/') === 0 || urlToCheck.indexOf('./') === 0 || urlToCheck.indexOf('../') === 0) {
-        return true;
-    }
-    return false;
-}
-exports.isUrl = isUrl;
-function loadFile(url) {
-    return new Promise(function (resolve, reject) {
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', url);
-        xhr.send();
-        xhr.onreadystatechange = function () {
-            var DONE = 4;
-            var OK = 200;
-            if (xhr.readyState === DONE) {
-                if (xhr.status === OK) {
-                    resolve(xhr.responseText);
-                }
-            }
-            else {
-                console.log('Error: ' + xhr.status, url);
-                reject('Error: ' + xhr.status);
-            }
-        };
-    });
-}
-exports.loadFile = loadFile;
-function kebabToCamel(s) {
-    return s.replace(/(\-\w)/g, function (m) { return m[1].toUpperCase(); });
-}
-exports.kebabToCamel = kebabToCamel;
-function camelToKebab(str) {
-    return !str ? null : str.replace(/([A-Z])/g, function (g) { return '-' + g[0].toLowerCase(); });
-}
-exports.camelToKebab = camelToKebab;
-
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var babylonjs_1 = __webpack_require__(0);
-var helper_1 = __webpack_require__(5);
-var HTMLMapper = (function () {
-    function HTMLMapper() {
-    }
-    HTMLMapper.prototype.map = function (element) {
-        var config = {};
-        var _loop_1 = function (attrIdx) {
-            var attr = element.attributes.item(attrIdx);
-            var split = attr.nodeName.split('.');
-            split.reduce(function (currentConfig, key, idx) {
-                var camelKey = helper_1.kebabToCamel(key);
-                if (idx === split.length - 1) {
-                    var val = attr.nodeValue;
-                    if (val === "true") {
-                        val = true;
-                    }
-                    else if (val === "false") {
-                        val = false;
-                    }
-                    else {
-                        var number = parseFloat(val);
-                        if (!isNaN(number)) {
-                            val = number;
-                        }
-                    }
-                    currentConfig[camelKey] = val;
-                }
-                else {
-                    currentConfig[camelKey] = currentConfig[camelKey] || {};
-                }
-                return currentConfig[camelKey];
-            }, config);
-        };
-        for (var attrIdx = 0; attrIdx < element.attributes.length; ++attrIdx) {
-            _loop_1(attrIdx);
-        }
-        return config;
-    };
-    return HTMLMapper;
-}());
-var JSONMapper = (function () {
-    function JSONMapper() {
-    }
-    JSONMapper.prototype.map = function (rawSource) {
-        return JSON.parse(rawSource);
-    };
-    return JSONMapper;
-}());
-var DOMMapper = (function () {
-    function DOMMapper() {
-    }
-    DOMMapper.prototype.map = function (baseElement) {
-        var htmlMapper = new HTMLMapper();
-        var config = htmlMapper.map(baseElement);
-        var traverseChildren = function (element, partConfig) {
-            var children = element.children;
-            if (children.length) {
-                for (var i = 0; i < children.length; ++i) {
-                    var item = children.item(i);
-                    var configMapped = htmlMapper.map(item);
-                    var key = helper_1.kebabToCamel(item.nodeName.toLowerCase());
-                    if (item.attributes.getNamedItem('array') && item.attributes.getNamedItem('array').nodeValue === 'true') {
-                        partConfig[key] = [];
-                    }
-                    else {
-                        if (element.attributes.getNamedItem('array') && element.attributes.getNamedItem('array').nodeValue === 'true') {
-                            partConfig.push(configMapped);
-                        }
-                        else if (partConfig[key]) {
-                            element.setAttribute('array', 'true');
-                            var oldItem = partConfig[key];
-                            partConfig = [oldItem, configMapped];
-                        }
-                        else {
-                            partConfig[key] = configMapped;
-                        }
-                    }
-                    traverseChildren(item, partConfig[key] || configMapped);
-                }
-            }
-            return partConfig;
-        };
-        traverseChildren(baseElement, config);
-        return config;
-    };
-    return DOMMapper;
-}());
-var MapperManager = (function () {
-    function MapperManager() {
-        this.mappers = {
-            "html": new HTMLMapper(),
-            "json": new JSONMapper(),
-            "dom": new DOMMapper()
-        };
-    }
-    MapperManager.prototype.getMapper = function (type) {
-        if (!this.mappers[type]) {
-            babylonjs_1.Tools.Error("No mapper defined for " + type);
-        }
-        return this.mappers[type] || this.mappers[MapperManager.DefaultMapper];
-    };
-    MapperManager.prototype.registerMapper = function (type, mapper) {
-        this.mappers[type] = mapper;
-    };
-    MapperManager.DefaultMapper = 'json';
-    return MapperManager;
-}());
-exports.MapperManager = MapperManager;
-exports.mapperManager = new MapperManager();
-exports.default = exports.mapperManager;
-
-
-/***/ }),
 /* 7 */
 /***/ (function(module, exports) {
 
@@ -78590,11 +78594,13 @@ module.exports = "Error loading the model";
 "use strict";
 /* WEBPACK VAR INJECTION */(function(global) {
 Object.defineProperty(exports, "__esModule", { value: true });
-var viewerManager_1 = __webpack_require__(2);
+var mappers_1 = __webpack_require__(2);
+exports.mapperManager = mappers_1.mapperManager;
+var viewerManager_1 = __webpack_require__(4);
 exports.viewerManager = viewerManager_1.viewerManager;
-var defaultViewer_1 = __webpack_require__(3);
+var defaultViewer_1 = __webpack_require__(5);
 exports.DefaultViewer = defaultViewer_1.DefaultViewer;
-var viewer_1 = __webpack_require__(4);
+var viewer_1 = __webpack_require__(6);
 exports.AbstractViewer = viewer_1.AbstractViewer;
 __webpack_require__(0);
 __webpack_require__(30);
@@ -104846,7 +104852,7 @@ if (!root['OIMO']) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var babylonjs_1 = __webpack_require__(0);
-var helper_1 = __webpack_require__(5);
+var helper_1 = __webpack_require__(3);
 var TemplateManager = (function () {
     function TemplateManager(containerElement) {
         this.containerElement = containerElement;
@@ -105056,7 +105062,7 @@ function getTemplateAsHtml(templateConfig) {
         }
         else {
             location_1 = location_1.replace('#', '');
-            var element = document.getElementById('#' + location_1);
+            var element = document.getElementById(location_1);
             if (element) {
                 return Promise.resolve(element.innerHTML);
             }
@@ -105119,7 +105125,7 @@ var f=g.nameLookup(e,b[c],a);return d?[" && ",f]:[" != null ? ",f," : ",e]})},re
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var mappers_1 = __webpack_require__(6);
+var mappers_1 = __webpack_require__(2);
 var types_1 = __webpack_require__(20);
 var merge = __webpack_require__(27);
 var ConfigurationLoader = (function () {
@@ -107707,8 +107713,8 @@ this._uniformBuffer.updateMatrix("diffuseMatrix",this._diffuseTexture.getTexture
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var defaultViewer_1 = __webpack_require__(3);
-var mappers_1 = __webpack_require__(6);
+var defaultViewer_1 = __webpack_require__(5);
+var mappers_1 = __webpack_require__(2);
 function InitTags(selector) {
     if (selector === void 0) { selector = 'babylon'; }
     var elements = document.querySelectorAll(selector);

Viewer/package.json

@@ -23,7 +23,7 @@
     },
     "homepage": "https://github.com/BabylonJS/Babylon.js#readme",
     "devDependencies": {
-        "@types/node": "^8.0.51",
+        "@types/node": "^8.0.52",
         "base64-image-loader": "^1.2.0",
         "html-loader": "^0.5.1",
         "json-loader": "^0.5.7",
@@ -34,15 +34,15 @@
         "webpack-dev-server": "^2.9.4"
     },
     "dependencies": {
-        "babylonjs": "^3.1.0-beta1.1.1",
-        "babylonjs-loaders": "^3.1.0-beta1.1",
-        "babylonjs-materials": "^3.1.0-beta1.1",
-        "babylonjs-post-process": "^3.1.0-beta1.1",
-        "babylonjs-procedural-textures": "^3.1.0-beta1.1",
+        "babylonjs": "^3.1.0-beta3",
+        "babylonjs-loaders": "^3.1.0-beta3",
+        "babylonjs-materials": "^3.1.0-beta3",
+        "babylonjs-post-process": "^3.1.0-beta3",
+        "babylonjs-procedural-textures": "^3.1.0-beta3",
         "es6-promise": "^4.1.1",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.4",
         "lodash.merge": "^4.6.0",
         "promise-polyfill": "^6.0.2"
     }
-}
+}