Release 16.2.8

Cherry-picked changesets: d4dbaf7 Dmitry Levkovskiy - Fix T525720: Interface 'dxLoadPanelOptions' incorrectly extends interface 'dxOverlayOptions' (#390) (#550) f139a16 Andrey Lukyanov - fix unstable scrollview tests for FF (#547)
DevExpress · Jun 30, 2017 · 704bb49 · 704bb49
1 parent 30a79f2
commit 704bb49
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/js/ui/load_panel.js b/js/ui/load_panel.js
@@ -66,12 +66,14 @@ var LoadPanel = Overlay.inherit({
             * @name dxLoadPanelOptions_animation_show
             * @publicName show
             * @default null
+            * @type animationConfig
             * @extend_doc
             */
             /**
             * @name dxLoadPanelOptions_animation_hide
             * @publicName hide
             * @default null
+            * @type animationConfig
             * @extend_doc
             */
             animation: null,

diff --git a/testing/tests/DevExpress.ui.widgets/scrollView.tests.js b/testing/tests/DevExpress.ui.widgets/scrollView.tests.js
@@ -686,7 +686,7 @@ QUnit.test("scrollview onReachBottom action fired when bottom position is reache
         inertiaEnabled: false,
         onReachBottom: function() {
             var location = getScrollOffset($scrollView);
-            assert.equal(Math.round(location.top), -Math.round($content.height() - $container.height()));
+            assert.roughEqual(location.top, $container.height() - $content.height(), 1);
         }
     });
 
@@ -775,7 +775,7 @@ QUnit.test("release after loading cause bounce to the bottom bound", function(as
         },
         onEnd: function() {
             var location = getScrollOffset($scrollView);
-            assert.equal(Math.round(location.top), -Math.round($content.height() - $container.height()), "scrollview bounced");
+            assert.roughEqual(location.top, $container.height() - $content.height(), 1, "scrollview bounced");
         }
     });
 
@@ -1098,7 +1098,7 @@ QUnit.test("release calls update", function(assert) {
         },
         onReachBottom: function() {
             var location = getScrollOffset($scrollView);
-            assert.equal(Math.round(location.top), -Math.round($content.height() - $container.height()));
+            assert.roughEqual(location.top, $container.height() - $content.height(), 1);
         }
     });
 

diff --git a/ts/widgets-base.d.ts b/ts/widgets-base.d.ts
@@ -1378,11 +1378,15 @@ declare module DevExpress.ui {
         /** @docid_ignore dxLoadPanelOptions_accessKey */
         /** @docid_ignore dxLoadPanelOptions_tabIndex */
         /** @docid_ignore dxLoadPanelOptions_shadingColor */
-        /** @docid_ignore dxLoadPanelOptions_animation_show */
-        /** @docid_ignore dxLoadPanelOptions_animation_hide */
 
         /** @docid dxLoadPanelOptions_animation */
-        animation?: fx.AnimationOptions;
+        animation?: {
+            /** @docid dxLoadPanelOptions_animation_show */
+            show?: fx.AnimationOptions;
+
+            /** @docid dxLoadPanelOptions_animation_hide */
+            hide?: fx.AnimationOptions;
+        };
 
         /** @docid dxLoadPanelOptions_delay */
         delay?: number;