Merge 4c82c54 into 128931b

CometVisu · Jul 16, 2019 · e2a206b · e2a206b
2 parents 128931b + 4c82c54
commit e2a206b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -65,9 +65,9 @@ jobs:
   - name: 'End-to-end Tests: Chrome beta'
     env: CV_BUILD=test CV_BROWSER=Chrome_travis CV_VERSION=beta
     script: *2
-  - name: 'End-to-end Tests: Chrome unstable'
-    env: CV_BUILD=test CV_BROWSER=Chrome_travis CV_VERSION=unstable
-    script: *2
+#  - name: 'End-to-end Tests: Chrome unstable'
+#    env: CV_BUILD=test CV_BROWSER=Chrome_travis CV_VERSION=unstable
+#    script: *2
   - stage: deploy
     name: "[DOCS] - Generate and publish manual and API-viewer"
     env: CV_BUILD=docs ENCRYPTION_LABEL=4c79fec0aeb9 COMMIT_AUTHOR_EMAIL=generator@cometvisu.org CV_BROWSER=Chrome_travis CV_VERSION=stable

diff --git a/source/class/cv/ui/structure/pure/Slide.js b/source/class/cv/ui/structure/pure/Slide.js
@@ -112,8 +112,13 @@ qx.Class.define('cv.ui.structure.pure.Slide', {
         slider.init();
         // set initial value
         slider.setValue(parseFloat(this.getValue()));
+        var throttled = qx.util.Function.throttle(this._onChangeValue, 250, {trailing: false}).bind(this);
 
-        slider.on("changeValue", qx.util.Function.throttle(this._onChangeValue, 250, {trailing: true}), this);
+        slider.on("changeValue", function (ev) {
+          if (!this.__skipUpdatesFromSlider) {
+            throttled(ev);
+          }
+        }, this);
 
         this.addListener("changeValue", function (ev) {
           this.__skipUpdatesFromSlider = true;
@@ -167,11 +172,11 @@ qx.Class.define('cv.ui.structure.pure.Slide', {
       try {
         if (this.getValue() !== value) {
           this.setValue(value);
-          this.__skipUpdatesFromSlider = true;
           if (this.__slider) {
+            this.__skipUpdatesFromSlider = true;
             this.__slider.setValue(value);
+            this.__skipUpdatesFromSlider = false;
           }
-          this.__skipUpdatesFromSlider = false;
         }
       } catch(e) {
         this.error(e);