From e36ce9af8e5e136caff13cd88d5747677014dfa1 Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <koop@git.wordpress.org>
Date: Fri, 16 Nov 2012 10:30:36 +0000
Subject: [PATCH] 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.


git-svn-id: https://develop.svn.wordpress.org/trunk@22612 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/css/media-views.css | 6 +++---
 wp-includes/js/media-views.js   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-includes/css/media-views.css b/wp-includes/css/media-views.css
index bda852cc27..ea5d09a6b4 100644
--- a/wp-includes/css/media-views.css
+++ b/wp-includes/css/media-views.css
@@ -24,7 +24,7 @@
 	left: 40px;
 	right: 40px;
 	bottom: 40px;
-	z-index: 50000;
+	z-index: 125000;
 }
 
 .media-modal-backdrop {
@@ -35,7 +35,7 @@
 	bottom: 0;
 	background: #000;
 	opacity: 0.8;
-	z-index: 40000;
+	z-index: 120000;
 }
 
 .media-modal-backdrop div {
@@ -671,7 +671,7 @@
 	bottom: 0;
 	background: rgba( 0, 86, 132, 0.9 );
 
-	z-index: 200000;
+	z-index: 250000;
 	display: none;
 	text-align: center;
 	opacity: 0;
diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index e5b67d9ca5..63384daafc 100644
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -659,7 +659,8 @@
 			if ( this.options.uploader ) {
 				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
 					}
 				});
 			}