@xeokit/xeokit-sdk 2.5.2-beta-8 → 2.5.2-beta-10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.5.2-beta-8",
+  "version": "2.5.2-beta-10",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/AnnotationsPlugin/Annotation.js

@@ -151,7 +151,7 @@ class Annotation extends Marker {
             if (utils.isArray(markerHTML)) {
                 markerHTML = markerHTML.join("");
             }
-            markerHTML = this._renderTemplate(markerHTML);
+            markerHTML = this._renderTemplate(markerHTML.trim());
             const markerFragment = document.createRange().createContextualFragment(markerHTML);
             this._marker = markerFragment.firstChild;
             this._container.appendChild(this._marker);
@@ -178,7 +178,7 @@ class Annotation extends Marker {
             if (utils.isArray(labelHTML)) {
                 labelHTML = labelHTML.join("");
             }
-            labelHTML = this._renderTemplate(labelHTML);
+            labelHTML = this._renderTemplate(labelHTML.trim());
             const labelFragment = document.createRange().createContextualFragment(labelHTML);
             this._label = labelFragment.firstChild;
             this._container.appendChild(this._label);

package/src/plugins/GLTFLoaderPlugin/GLTFDefaultDataSource.js

@@ -1,4 +1,5 @@
 import {utils} from "../../viewer/scene/utils.js";
+import {core} from "../../viewer/scene/core";
 
 /**
  * Default data access strategy for {@link GLTFLoaderPlugin}.
@@ -104,13 +105,13 @@ function loadArraybuffer(glTFSrc, binarySrc, ok, err) {
             for (var i = 0; i < data.length; i++) {
                 view[i] = data.charCodeAt(i);
             }
-            window.setTimeout(function () {
+            core.scheduleTask(function () {
                 ok(buffer);
-            }, 0);
+            });
         } catch (error) {
-            window.setTimeout(function () {
+            core.scheduleTask(function () {
                 err(error);
-            }, 0);
+            });
         }
     } else {
         const basePath = getBasePath(glTFSrc);

package/src/plugins/XKTLoaderPlugin/XKTLoaderPlugin.js

@@ -957,14 +957,13 @@ class XKTLoaderPlugin extends Plugin {
             sceneModel.once("destroyed", () => {
                 this.viewer.metaScene.destroyMetaModel(metaModel.id);
             });
-            window.setTimeout(() => {
-
+            this.scheduleTask(() => {
                 if (sceneModel.destroyed) {
                     return;
                 }
                 sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
                 sceneModel.fire("loaded", true, false); // Don't forget the event, for late subscribers
-            }, 100);
+            });
         }
 
         const error = (errMsg) => {
@@ -1042,7 +1041,7 @@ class XKTLoaderPlugin extends Plugin {
                                     globalizeObjectIds: options.globalizeObjectIds
                                 });
                                 i++;
-                                window.setTimeout( loadNext, 100);
+                                this.scheduleTask( loadNext, 100);
                             }, error);
                         }
                     }
@@ -1057,7 +1056,7 @@ class XKTLoaderPlugin extends Plugin {
                             this._dataSource.getXKT(`${baseDir}${xktFiles[i]}`, (arrayBuffer) => {
                                 this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
                                 i++;
-                                window.setTimeout(loadNext, 100);
+                                this.scheduleTask(loadNext, 100);
                             }, error);
                         }
                     }