diff --git a/css/themes/default/jquery.mobile.theme.css b/css/themes/default/jquery.mobile.theme.css index af19668d..1e5c43e5 100644 --- a/css/themes/default/jquery.mobile.theme.css +++ b/css/themes/default/jquery.mobile.theme.css @@ -44,7 +44,7 @@ color: #2489CE /*{a-bar-link-visited}*/; } .ui-body-a, -.ui-dialog.ui-overlay-a { +.ui-dialog-page.ui-overlay-a { border: 1px solid #2A2A2A /*{a-body-border}*/; background: #222222 /*{a-body-background-color}*/; color: #fff /*{a-body-color}*/; @@ -184,7 +184,7 @@ color: #ddf0f8 /*{b-bar-link-visited}*/; } .ui-body-b, -.ui-dialog.ui-overlay-b { +.ui-dialog-page.ui-overlay-b { border: 1px solid #C6C6C6 /*{b-body-border}*/; background: #cccccc /*{b-body-background-color}*/; color: #333333 /*{b-body-color}*/; @@ -326,7 +326,7 @@ font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/; } .ui-body-c, -.ui-dialog.ui-overlay-c { +.ui-dialog-page.ui-overlay-c { border: 1px solid #B3B3B3 /*{c-body-border}*/; color: #333333 /*{c-body-color}*/; text-shadow: 0 /*{c-body-shadow-x}*/ 1px /*{c-body-shadow-y}*/ 0 /*{c-body-shadow-radius}*/ #fff /*{c-body-shadow-color}*/; @@ -468,7 +468,7 @@ } .ui-body-d, -.ui-dialog.ui-overlay-d { +.ui-dialog-page.ui-overlay-d { border: 1px solid #ccc /*{d-body-border}*/; color: #333333 /*{d-body-color}*/; text-shadow: 0 /*{d-body-shadow-x}*/ 1px /*{d-body-shadow-y}*/ 0 /*{d-body-shadow-radius}*/ #fff /*{d-body-shadow-color}*/; @@ -609,7 +609,7 @@ } .ui-body-e, -.ui-dialog.ui-overlay-e { +.ui-dialog-page.ui-overlay-e { border: 1px solid #F7C942 /*{e-body-border}*/; color: #333333 /*{e-body-color}*/; text-shadow: 0 /*{e-body-shadow-x}*/ 1px /*{e-body-shadow-y}*/ 0 /*{e-body-shadow-radius}*/ #fff /*{e-body-shadow-color}*/; diff --git a/js/jquery.mobile.dialog.js b/js/jquery.mobile.dialog.js index 206ea77a..c6479fe4 100644 --- a/js/jquery.mobile.dialog.js +++ b/js/jquery.mobile.dialog.js @@ -19,7 +19,7 @@ $.widget( "mobile.dialog", $.mobile.widget, { "class" : "ui-dialog ui-corner-all ui-overlay-shadow" }); - $el.addClass( "ui-overlay-" + this.options.overlayTheme ); + $el.addClass( "ui-dialog-page ui-overlay-" + this.options.overlayTheme ); // Class the markup for dialog styling // Set aria role diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js index fb80fa2f..cb3ca80d 100644 --- a/tests/unit/dialog/dialog_events.js +++ b/tests/unit/dialog/dialog_events.js @@ -28,7 +28,7 @@ ok( /&ui-state=dialog/.test(location.hash), "ui-state=dialog =~ location.hash", "dialog open" ); // close the dialog - $( ".ui-dialog" ).dialog( "close" ); + $( ".ui-dialog-page" ).dialog( "close" ); }, function() { diff --git a/tests/unit/navigation/navigation_core.js b/tests/unit/navigation/navigation_core.js index 7d61bcff..1a1b195b 100644 --- a/tests/unit/navigation/navigation_core.js +++ b/tests/unit/navigation/navigation_core.js @@ -1062,7 +1062,7 @@ }, function() { - ok( $.mobile.activePage.is(".ui-dialog"), "prefetched page is rendered as a dialog" ); + ok( $.mobile.activePage.is(".ui-dialog-page"), "prefetched page is rendered as a dialog" ); start(); } ]);