Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#659486 by Kiphaas7 and xmacinfo: Add back the 'loading' image to the Overlay in a way that does not kill performance.

merge-requests/26/head
Angie Byron 2009-12-15 05:28:59 +00:00
parent e14a263914
commit c3080a0401
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/overlay/overlay-parent.css
View File

@ -67,10 +67,14 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow: visible; overflow: visible;
background: #fff url(images/loading.gif) no-repeat 50% 50%;
-webkit-box-shadow: 8px 8px 8px rgba(0,0,0,.5); -webkit-box-shadow: 8px 8px 8px rgba(0,0,0,.5);
-moz-box-shadow: 8px 8px 8px rgba(0,0,0,.5); -moz-box-shadow: 8px 8px 8px rgba(0,0,0,.5);
box-shadow: 8px 8px 8px rgba(0,0,0,.5); box-shadow: 8px 8px 8px rgba(0,0,0,.5);
} }
.overlay-loaded #overlay-container {
background: none;
}
.overlay #overlay-element { .overlay #overlay-element {
overflow: hidden; overflow: hidden;
} }

6
modules/overlay/overlay-parent.js
View File

@ -254,6 +254,12 @@ Drupal.overlay.create = function () {
Drupal.overlay.load = function (url) { Drupal.overlay.load = function (url) {
var self = this; var self = this;
var iframe = self.iframe.$element.get(0); var iframe = self.iframe.$element.get(0);
// Add a loaded class to the overlay once the iframe is loaded.
$(iframe).load(function () {
$('.overlay').addClass('overlay-loaded');
});
// Get the document object of the iframe window. // Get the document object of the iframe window.
// @see http://xkr.us/articles/dom/iframe-document/ // @see http://xkr.us/articles/dom/iframe-document/
var doc = (iframe.contentWindow || iframe.contentDocument); var doc = (iframe.contentWindow || iframe.contentDocument);