Changeset 29346

Timestamp:

08/01/2014 08:14:43 PM (12 years ago)

Author:

ocean90

Message:

Disable background page scrolling when modals are open.

props celloexpressions.
fixes #29074.

Location:

trunk/src

Files:

• wp-admin/css/common.css (modified) (1 diff)
• wp-admin/css/themes.css (modified) (1 diff)
• wp-admin/js/theme.js (modified) (2 diffs)
• wp-includes/js/media-views.js (modified) (2 diffs)
• wp-includes/js/thickbox/thickbox.js (modified) (2 diffs)

trunk/src/wp-admin/css/common.css

@@ -217 +217 @@
         min-width: 0;
         padding-top: 1px;
+}
+
+body.modal-open {
+        overflow: hidden;
 }
 

trunk/src/wp-admin/css/themes.css

@@ -410 +410 @@
 }
 
-body.theme-overlay-open {
-        overflow: hidden;
-}
-
 .theme-overlay .theme-header {
         position: absolute;

trunk/src/wp-admin/js/theme.js

@@ -702 +702 @@
         // the theme details overlay
         closeOverlay: function() {
-                $( 'body' ).removeClass( 'theme-overlay-open' );
+                $( 'body' ).removeClass( 'modal-open' );
                 this.remove();
                 this.unbind();
@@ -1001 +1001 @@
                 // Sets this.view to 'detail'
                 this.setView( 'detail' );
-                $( 'body' ).addClass( 'theme-overlay-open' );
+                $( 'body' ).addClass( 'modal-open' );
 
                 // Set up the theme details view

trunk/src/wp-includes/js/media-views.js

@@ -3229 +3229 @@
                         }
 
+                        // Disable page scrolling.
+                        $( 'body' ).addClass( 'modal-open' );
+
                         $el.show().find( '.media-modal-close' ).focus();
                         return this.propagate('open');
@@ -3243 +3246 @@
                                 return this;
                         }
+
+                        // Enable page scrolling.
+                        $( 'body' ).removeClass( 'modal-open' );
 
                         // Hide modal and remove restricted media modal tab focus once it's closed

trunk/src/wp-includes/js/thickbox/thickbox.js

@@ -47 +47 @@
                                 jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window'></div>");
                                 jQuery("#TB_overlay").click(tb_remove);
+                                jQuery( 'body' ).addClass( 'modal-open' );
                         }
                 }
@@ -265 +266 @@
         jQuery("#TB_closeWindowButton").unbind("click");
         jQuery("#TB_window").fadeOut("fast",function(){jQuery('#TB_window,#TB_overlay,#TB_HideSelect').trigger("tb_unload").unbind().remove();});
+        jQuery( 'body' ).removeClass( 'modal-open' );
         jQuery("#TB_load").remove();
         if (typeof document.body.style.maxHeight == "undefined") {//if IE 6