Changeset 22612

Timestamp:

11/16/2012 10:30:36 AM (14 years ago)

Author:

koopersmith

Message:

Media: zIndex peace was only temporary.

Revert [22611] in favor of using plupload's container setting. Turns out, plupload's flash shim is forced to the exact same index as the admin bar, so balancing the two is better solved by nesting the shim.

see #22441, #22446, #21390.

Location:

trunk/wp-includes

Files:

• css/media-views.css (modified) (3 diffs)
• js/media-views.js (modified) (1 diff)

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

@@ -25 +25 @@
         right: 40px;
         bottom: 40px;
-        z-index: 50000;
+        z-index: 125000;
 }
 
@@ -36 +36 @@
         background: #000;
         opacity: 0.8;
-        z-index: 40000;
+        z-index: 120000;
 }
 
@@ -672 +672 @@
         background: rgba( 0, 86, 132, 0.9 );
 
-        z-index: 200000;
+        z-index: 250000;
         display: none;
         text-align: center;

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

@@ -660 +660 @@
                                 this.uploader = new media.view.UploaderWindow({
                                         uploader: {
-                                                dropzone: this.modal ? this.modal.$el : this.$el
+                                                dropzone:  this.modal ? this.modal.$el : this.$el,
+                                                container: this.$el
                                         }
                                 });