Skip to content

Commit d1e8083

Browse files
committed
Merge pull request jquery-archive#2152 from webmynd/master
Consider data-role when picking page transition in changePage
2 parents f84f359 + 9cf3a60 commit d1e8083

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

js/jquery.mobile.navigation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@
915915
// Make sure we have a transition defined.
916916
settings.transition = settings.transition
917917
|| ( ( historyDir && !activeIsInitialPage ) ? active.transition : undefined )
918-
|| ( settings.role === "dialog" ? $.mobile.defaultDialogTransition : $.mobile.defaultPageTransition );
918+
|| ( isDialog ? $.mobile.defaultDialogTransition : $.mobile.defaultPageTransition );
919919

920920
// If we're navigating back in the URL history, set reverse accordingly.
921921
settings.reverse = settings.reverse || historyDir < 0;

0 commit comments

Comments
 (0)