').append($tabs.clone()).remove().html());
+
+ self.$dialog.find('.ui-dialog-titlebar').append($tabs);
+ if ($tabs.is('.primary')) {
+ $tabs.find('a').removeClass('overlay-processed');
+ Drupal.attachBehaviors($tabs);
}
// Remove any classes from the list element to avoid theme styles
// clashing with our styling.
- $(tabs).removeAttr('class');
+ $tabs.removeAttr('class');
}
});
};
@@ -556,10 +578,10 @@
iFrameWindow.jQuery(iFrameWindow.document).unbind('keydown.overlay-event');
// Change the overlay title.
- $('.overlay .ui-dialog-title').html(Drupal.t('Please wait...'));
+ self.$dialog.find('.ui-dialog-title').html(Drupal.t('Please wait...'));
// Hide the iframe element.
- self.iframe.$element.fadeOut('fast');
+ self.$iframe.fadeOut('fast');
};
/**
@@ -600,7 +622,7 @@
}
return self.adminPathRegExp.exec(path) && !self.nonAdminPathRegExp.exec(path);
-}
+};
/**
* Sanitize dialog size.
@@ -625,28 +647,22 @@
if (typeof size.width != 'number') {
width = maxWidth;
}
- // Set to at least minWidth but at most maxWidth.
- else if (size.width < minWidth || size.width > maxWidth) {
- width = Math.min(maxWidth, Math.max(minWidth, size.width));
- }
else {
- width = size.width;
+ // Set to at least minWidth but at most maxWidth.
+ width = Math.min(maxWidth, Math.max(minWidth, size.width));
}
- // Use 100px as the minimum height. Expand to 92% of the window if height
- // was invalid, to ensure that we have a reasonable chance to show content.
- var minHeight = 100, maxHeight = parseInt($window.height() * .92);
+ // Use 100px as the minimum height.
+ var minHeight = 100;
if (typeof size.height != 'number') {
- height = maxHeight;
- }
- else if (size.height < minHeight) {
- // Do not consider maxHeight as the actual maximum height, since we rely on
- // the parent window scroll bar to scroll the window. Only set up to be at
- // least the minimal height.
- height = Math.max(minHeight, size.height);
+ // Expand to 92% of the window if height was invalid, to ensure that we have
+ // a reasonable chance to show content.
+ height = parseInt($window.height() * .92);
}
else {
- height = size.height;
+ // Do not consider a maximum height, since we rely on the parent window scroll
+ // bar to scroll the window. Only set up to be at least the minimal height.
+ height = Math.max(minHeight, size.height);
}
return { width: width, height: height };
};
@@ -683,33 +699,32 @@
var self = this;
// Compute frame and dialog size based on requested document size.
- var titleBarHeight = $('.overlay .ui-dialog-titlebar').outerHeight(true);
+ var titleBarHeight = self.$dialog.find('.ui-dialog-titlebar').outerHeight(true);
var frameSize = self.sanitizeSize(size);
var dialogSize = $.extend({}, frameSize);
dialogSize.height += titleBarHeight + 15;
// Compute position on viewport.
- var dialogPosition = self.computePosition($('.overlay'), dialogSize);
+ var dialogPosition = self.computePosition(self.$dialog, dialogSize);
var animationOptions = $.extend(dialogSize, dialogPosition);
// Perform the resize animation.
- $('.overlay').animate(animationOptions, 'fast', function () {
+ self.$dialog.animate(animationOptions, 'fast', function () {
// Proceed only if the dialog still exists.
- if ($.isObject(self.iframe.$element) && $.isObject(self.iframe.$container)) {
+ if ($.isObject(self.$iframe) && $.isObject(self.$container)) {
// Resize the iframe element and container.
- $('.overlay').width(dialogSize.width).height(dialogSize.height);
- self.iframe.$container.width(frameSize.width).height(frameSize.height);
- self.iframe.$element.width(frameSize.width).height(frameSize.height);
+ self.$container.width(frameSize.width).height(frameSize.height);
+ self.$iframe.width(frameSize.width).height(frameSize.height);
// Update the dialog size so that UI internals are aware of the change.
- self.iframe.$container.dialog('option', { width: dialogSize.width, height: dialogSize.height });
+ self.$container.dialog('option', { width: dialogSize.width, height: dialogSize.height });
// Keep the dim background grow or shrink with the dialog.
- $('.ui-widget-overlay').height($(document).height());
-
- // Animate body opacity, so we fade in the page as it loads in.
- $(self.iframe.$element.get(0)).contents().find('body.overlay').animate({opacity: 0.9999}, 'slow');
+ // The width needs to be updated when the height change resulted in a scrollbar.
+ $('.ui-widget-overlay')
+ .height($(document).height())
+ .width($('body').outerWidth());
}
});
};
@@ -796,9 +811,12 @@
// Determine the link's original destination, and make it relative to the
// Drupal site.
- var fullpath = link.pathname;
- var re = new RegExp('^' + Drupal.settings.basePath);
- var path = fullpath.replace(re, '');
+ var path = link.pathname;
+ // Ensure a leading slash on the path, omitted in some browsers.
+ if (path.substr(0, 1) != '/') {
+ path = '/' + path;
+ }
+ path = path.replace(new RegExp(Drupal.settings.basePath), '');
// Preserve existing query and fragment parameters in the URL.
var fragment = link.hash;
var querystring = link.search;
@@ -815,7 +833,7 @@
// Assemble the overlay-ready link.
var base = window.location.href;
return $.param.fragment(base, {'overlay':destination});
-}
+};
/**
* Make sure the internal overlay URL is reflected in the parent URL fragment.
@@ -882,7 +900,7 @@
*/
Drupal.theme.prototype.overlayContainer = function () {
return '
';
-}
+};
/**
* Theme function for the overlay title markup.