Browse Source

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

David Catuhe 7 năm trước cách đây
mục cha
commit
6e2c9b859d

+ 0 - 1
Viewer/assets/templates/default/fillContainer.html

@@ -13,7 +13,6 @@
     fill-container {
         width: 100%;
         height: 100%;
-        flex-direction: column;
 
         justify-content: flex-start;
         /* align items in Main Axis */

+ 4 - 0
Viewer/assets/templates/default/navbar.html

@@ -377,6 +377,10 @@
         background: rgba(91, 93, 107, 1);
         margin-top: 0px;
     }
+
+    span {
+        display: inline-block;
+    }
 </style>
 
 {{#if (or (not animations) hideAnimations)}} {{#if hideLogo}}

+ 2 - 3
Viewer/src/viewer/defaultViewer.ts

@@ -61,7 +61,6 @@ export class DefaultViewer extends AbstractViewer {
 
             this.templateManager.eventManager.registerCallback("navBar", (event: EventCallback) => {
                 let element = <HTMLInputElement>event.event.srcElement;
-                console.log(element.value);
                 if (!this._currentAnimation) return;
                 const gotoFrame = +element.value / 100 * this._currentAnimation.frames;
                 if (isNaN(gotoFrame)) return;
@@ -166,11 +165,11 @@ export class DefaultViewer extends AbstractViewer {
     private _updateProgressBar = () => {
         let navbar = this.templateManager.getTemplate('navBar');
         if (!navbar) return;
-        var progressSlider = <HTMLInputElement>navbar.parent.querySelector("input.progress-wrapper");
+        var progressSlider = <HTMLInputElement>navbar.parent.querySelector("input#progress-wrapper");
         if (progressSlider && this._currentAnimation) {
             const progress = this._currentAnimation.currentFrame / this._currentAnimation.frames * 100;
             var currentValue = progressSlider.valueAsNumber;
-            if (Math.abs(currentValue - progress) > 0.1) { // Only move if greater than a 1% change
+            if (Math.abs(currentValue - progress) > 0.5) { // Only move if greater than a 1% change
                 progressSlider.value = '' + progress;
             }