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

#668104 follow-up by casey: Make overlay respect other click handlers, fixes for Webkit.

merge-requests/26/head
Angie Byron 2010-01-07 19:59:56 +00:00
parent c0a0e5d710
commit 34789dce2a
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,9 +208,9 @@ Drupal.overlay.create = function () {
// When the iframe is still loading don't destroy it immediately but after // When the iframe is still loading don't destroy it immediately but after
// the content is loaded (see self.load). // the content is loaded (see self.load).
if (!self.isLoading) { if (!self.isLoading) {
// As the iframe is being removed we need to remove all load handlers, not // As some browsers (webkit) fire a load event when the iframe is removed,
// just the ones namespaced with overlay-event. // load handlers need to be unbound before removing the iframe.
self.$iframe.unbind('load'); self.$iframe.unbind('load.overlay-event');
self.destroy(); self.destroy();
} }
@ -671,8 +671,9 @@ Drupal.overlay.clickHandler = function (event) {
} }
var href = $target.attr('href'); var href = $target.attr('href');
// Only continue if link has an href attribute. // Only continue if link has an href attribute and is not just linking to
if (href != undefined) { // an anchor.
if (href != undefined && href != '' && href.charAt(0) != '#') {
// Open admin links in the overlay. // Open admin links in the overlay.
if (self.isAdminLink(href)) { if (self.isAdminLink(href)) {
href = self.fragmentizeLink($target.get(0)); href = self.fragmentizeLink($target.get(0));
@ -714,6 +715,16 @@ Drupal.overlay.clickHandler = function (event) {
// Add a target attribute to the clicked link. This is being picked up by // Add a target attribute to the clicked link. This is being picked up by
// the default action handler. // the default action handler.
if (inFrame) { if (inFrame) {
// When the link has a destination query parameter and that destination
// is an admin link we need to fragmentize it. This will make it reopen
// in the overlay.
var params = $.deparam.querystring(href);
if (params.destination && self.isAdminLink(params.destination)) {
var fragmentizedDestination = $.param.fragment(self.getPath(window.location), { overlay: params.destination });
href = $.param.querystring(href, { destination: fragmentizedDestination });
$target.attr('href', href);
}
// Make the link to be opening in the immediate parent of the frame. // Make the link to be opening in the immediate parent of the frame.
$target.attr('target', '_parent'); $target.attr('target', '_parent');
} }