Changeset 23029

Timestamp:

12/04/2012 05:58:24 PM (12 years ago)

Author:

markjaquith

Message:

Fix a Firefox "scroll to bottom" bug when launching the media modal.

• Records main document scroll position when launching media modal.
• Restores position when media modal is closed.
• Also locks background document scrolling while media modal is open, preventing inadvertent scrolling there.

props koopersmith. fixes #22716

File:

• trunk/wp-includes/js/media-views.js (modified) (4 diffs)

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

@@ -1867 +1867 @@
                 container: document.body,
                 title:     '',
-                propagate: true
+                propagate: true,
+                freeze:    document.body
             });
         },
@@ -1903 +1904 @@
 
         open: function() {
-            if ( this.$el.is(':visible') )
+            var $el = this.$el,
+                options = this.options,
+                $freeze;
+
+            if ( $el.is(':visible') )
                 return this;
 
@@ -1909 +1914 @@
                 this.attach();
 
-            this.$el.show().focus();
+            // If the `freeze` option is set, record the window's scroll
+            // position and the body's overflow, and then set overflow to hidden.
+            if ( options.freeze ) {
+                $freeze = $( options.freeze );
+                this._freeze = {
+                    overflow:  $freeze.css('overflow'),
+                    scrollTop: $( window ).scrollTop()
+                };
+                $freeze.css( 'overflow', 'hidden' );
+            }
+
+            $el.show().focus();
             return this.propagate('open');
         },
 
         close: function( options ) {
+            var freeze = this._freeze;
+
             if ( ! this.views.attached || ! this.$el.is(':visible') )
                 return this;
@@ -1919 +1937 @@
             this.$el.hide();
             this.propagate('close');
+
+            // If the `freeze` option is set, restore the container's scroll
+            // position and overflow property.
+            if ( freeze ) {
+                $( this.options.freeze ).css( 'overflow', freeze.overflow );
+                $( window ).scrollTop( freeze.scrollTop );
+            }
 
             if ( options && options.escape )