gistfile1.txt

From aca29b9e2f0a7df396837cb3bf6d6fda1edec28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"J.=20Ren=C3=A9e=20Beach"?= <[email protected]>
Date: Thu, 26 Jul 2012 13:35:50 -0400
Subject: [PATCH 1/4] DG-4778 / DG-4776 - changed the registration of an
 iframe resizing callback from the jQuery UI 'show'
 event to the 'load' event so that the calculation of
 the height of iframe content happens after the jQuery
 UI tabs are loaded and painted.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: J. Renée Beach <[email protected]>
---
 docroot/sites/all/modules/media/css/media.css       |    2 +-
 docroot/sites/all/modules/media/js/media.browser.js |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docroot/sites/all/modules/media/css/media.css b/docroot/sites/all/modules/media/css/media.css
index 71f64d8..6938882 100644
--- a/docroot/sites/all/modules/media/css/media.css
+++ b/docroot/sites/all/modules/media/css/media.css
@@ -373,7 +373,7 @@ body.page-media-format-form {
 }
 
 #media-browser-page {
-  background: #FFF;
+  background: transparent;
   padding: 1px 0;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
diff --git a/docroot/sites/all/modules/media/js/media.browser.js b/docroot/sites/all/modules/media/js/media.browser.js
index 28e5d4f..9fb9c4c 100644
--- a/docroot/sites/all/modules/media/js/media.browser.js
+++ b/docroot/sites/all/modules/media/js/media.browser.js
@@ -27,7 +27,7 @@ Drupal.behaviors.experimentalMediaBrowser = {
       }
     });
     tabSettings = {
-      show: Drupal.media.browser.resizeIframe
+      load: Drupal.media.browser.resizeIframe
     };
     if (active) {
       // To set a tab as selected, we have to first find its zero-based index
@@ -111,7 +111,7 @@ Drupal.media.browser.finalizeSelection = function () {
 };
 
 Drupal.media.browser.resizeIframe = function (event) {
-  var h = $('body').height();
+  var h = $('body').outerHeight(true);
   $(parent.window.document).find('#mediaBrowser').height(h);
 };
 
-- 
1.7.10.4


From 855ed4384939fe79273c2dd9644320c9baf78494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"J.=20Ren=C3=A9e=20Beach"?= <[email protected]>
Date: Thu, 26 Jul 2012 13:56:36 -0400
Subject: [PATCH 2/4] DG-4778 / DG-4776 - adding a media patch to gardens.make
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: J. Renée Beach <[email protected]>
---
 gardens.make |    1 +
 1 file changed, 1 insertion(+)

diff --git a/gardens.make b/gardens.make
index 6e29cd2..e315a66 100644
--- a/gardens.make
+++ b/gardens.make
@@ -756,6 +756,7 @@ projects[media][patch][] = "http://drupal.org/files/1364640.media_popup_js.3.pat
 projects[media][patch][] = "http://drupal.org/files/1595194_media_ie-image-upload-error_1.patch"
 projects[media][patch][] = "http://drupal.org/files/no-media-available-1500292-4.patch"
 projects[media][patch][] = "http://drupal.org/files/1565448-empty-browser-tab-output.patch"
+projects[media][patch][] = "http://drupal.org/files/1701732_media-browser-overlay-hidden-content_1.patch"
 
 ; Contrib module: media_browser_plus
 ; ---------------------------------------
-- 
1.7.10.4


From ab72c8dc98d2d5d6e51849ba11de341adf725fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"J.=20Ren=C3=A9e=20Beach"?= <[email protected]>
Date: Fri, 27 Jul 2012 11:54:24 -0400
Subject: [PATCH 3/4] DG-4776 - Removed borders from the Media overlay. This
 will be a patch that we will not submit to the module
 maintainers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: J. Renée Beach <[email protected]>
---
 docroot/sites/all/modules/media/css/media.css |    8 +-------
 gardens.make                                  |    1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/docroot/sites/all/modules/media/css/media.css b/docroot/sites/all/modules/media/css/media.css
index 6938882..0f04877 100644
--- a/docroot/sites/all/modules/media/css/media.css
+++ b/docroot/sites/all/modules/media/css/media.css
@@ -252,14 +252,8 @@ div#media-browser .throbber {
   background: #FFF;
 }
 
-#media-browser-tabset .media-browser-tab {
-  border: 1px solid #aaa;
-}
-
 #media-browser-tabset .ui-tabs-nav {
-  border-left: 1px solid #aaa;
-  border-right: 1px solid #aaa;
-  border-top: 1px solid #aaa;
+  border: 0 none;
 }
 
 .fake-ok {
diff --git a/gardens.make b/gardens.make
index e315a66..db2b199 100644
--- a/gardens.make
+++ b/gardens.make
@@ -757,6 +757,7 @@ projects[media][patch][] = "http://drupal.org/files/1595194_media_ie-image-uploa
 projects[media][patch][] = "http://drupal.org/files/no-media-available-1500292-4.patch"
 projects[media][patch][] = "http://drupal.org/files/1565448-empty-browser-tab-output.patch"
 projects[media][patch][] = "http://drupal.org/files/1701732_media-browser-overlay-hidden-content_1.patch"
+projects[media][patch][] = "https://raw.github.com/gist/3188851/5c134e9e9ed85f6528492275fac7693a0853750c/gistfile1.txt"
 
 ; Contrib module: media_browser_plus
 ; ---------------------------------------
-- 
1.7.10.4


From af41d05c6aefc80f426da1dfa20ee7f6be88863a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"J.=20Ren=C3=A9e=20Beach"?= <[email protected]>
Date: Wed, 1 Aug 2012 13:21:45 -0400
Subject: [PATCH 4/4] DG-5127 / DG-4776 - added the white background back to
 the media browser
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: J. Renée Beach <[email protected]>
---
 docroot/sites/all/modules/media/css/media.css |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docroot/sites/all/modules/media/css/media.css b/docroot/sites/all/modules/media/css/media.css
index 0f04877..abecf0c 100644
--- a/docroot/sites/all/modules/media/css/media.css
+++ b/docroot/sites/all/modules/media/css/media.css
@@ -367,7 +367,7 @@ body.page-media-format-form {
 }
 
 #media-browser-page {
-  background: transparent;
+  background: white;
   padding: 1px 0;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
-- 
1.7.10.4