Skip to content

Commit 704bb49

Browse files
committed
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)
1 parent 30a79f2 commit 704bb49

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

js/ui/load_panel.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,14 @@ var LoadPanel = Overlay.inherit({
6666
* @name dxLoadPanelOptions_animation_show
6767
* @publicName show
6868
* @default null
69+
* @type animationConfig
6970
* @extend_doc
7071
*/
7172
/**
7273
* @name dxLoadPanelOptions_animation_hide
7374
* @publicName hide
7475
* @default null
76+
* @type animationConfig
7577
* @extend_doc
7678
*/
7779
animation: null,

testing/tests/DevExpress.ui.widgets/scrollView.tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ QUnit.test("scrollview onReachBottom action fired when bottom position is reache
686686
inertiaEnabled: false,
687687
onReachBottom: function() {
688688
var location = getScrollOffset($scrollView);
689-
assert.equal(Math.round(location.top), -Math.round($content.height() - $container.height()));
689+
assert.roughEqual(location.top, $container.height() - $content.height(), 1);
690690
}
691691
});
692692

@@ -775,7 +775,7 @@ QUnit.test("release after loading cause bounce to the bottom bound", function(as
775775
},
776776
onEnd: function() {
777777
var location = getScrollOffset($scrollView);
778-
assert.equal(Math.round(location.top), -Math.round($content.height() - $container.height()), "scrollview bounced");
778+
assert.roughEqual(location.top, $container.height() - $content.height(), 1, "scrollview bounced");
779779
}
780780
});
781781

@@ -1098,7 +1098,7 @@ QUnit.test("release calls update", function(assert) {
10981098
},
10991099
onReachBottom: function() {
11001100
var location = getScrollOffset($scrollView);
1101-
assert.equal(Math.round(location.top), -Math.round($content.height() - $container.height()));
1101+
assert.roughEqual(location.top, $container.height() - $content.height(), 1);
11021102
}
11031103
});
11041104

ts/widgets-base.d.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,11 +1378,15 @@ declare module DevExpress.ui {
13781378
/** @docid_ignore dxLoadPanelOptions_accessKey */
13791379
/** @docid_ignore dxLoadPanelOptions_tabIndex */
13801380
/** @docid_ignore dxLoadPanelOptions_shadingColor */
1381-
/** @docid_ignore dxLoadPanelOptions_animation_show */
1382-
/** @docid_ignore dxLoadPanelOptions_animation_hide */
13831381

13841382
/** @docid dxLoadPanelOptions_animation */
1385-
animation?: fx.AnimationOptions;
1383+
animation?: {
1384+
/** @docid dxLoadPanelOptions_animation_show */
1385+
show?: fx.AnimationOptions;
1386+
1387+
/** @docid dxLoadPanelOptions_animation_hide */
1388+
hide?: fx.AnimationOptions;
1389+
};
13861390

13871391
/** @docid dxLoadPanelOptions_delay */
13881392
delay?: number;

0 commit comments

Comments
 (0)