diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-12 06:37:12 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-12 06:37:12 +0000 |
| commit | e2c4af8184e3ba33bc89407e579a53ffa2a718f3 (patch) | |
| tree | e685926a01d302acd5ea868853caae0df5f77821 | |
| parent | 319fc2895c5fdfad8fb11bb6c09dd8f1d15e042b (diff) | |
| download | brdo-e2c4af8184e3ba33bc89407e579a53ffa2a718f3.tar.gz brdo-e2c4af8184e3ba33bc89407e579a53ffa2a718f3.tar.bz2 | |
#674852 by casey: Fix bug where Overlays Loading screen incorrectly has a shortcut link on it.
| -rw-r--r-- | modules/overlay/overlay-parent.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 20260c2d1..345642ee0 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -286,6 +286,10 @@ Drupal.overlay.load = function (url) { // Change the overlay title. self.$container.dialog('option', 'title', Drupal.t('Loading...')); + // Remove any existing shortcut button markup in the title section. + self.$dialogTitlebar.find('.add-or-remove-shortcuts').remove(); + // Remove any existing tabs in the title section. + self.$dialogTitlebar.find('ul').remove(); // While the overlay is loading, we remove the loaded class from the dialog. // After the loading is finished, the loaded class is added back. The loaded @@ -407,8 +411,6 @@ Drupal.overlay.bindChild = function (iframeWindow, isClosing) { // Add a title attribute to the iframe for accessibility. self.$iframe.attr('title', Drupal.t('@title dialog', { '@title': iframeTitle })); - // Remove any existing shortcut button markup in the title section. - self.$dialogTitlebar.find('.add-or-remove-shortcuts').remove(); // If the shortcut add/delete button exists, move it to the dialog title. var $addToShortcuts = self.$iframeWindow('.add-or-remove-shortcuts'); if ($addToShortcuts.length) { @@ -420,8 +422,6 @@ Drupal.overlay.bindChild = function (iframeWindow, isClosing) { self.$dialogTitlebar.find('.ui-dialog-title').after($addToShortcuts); } - // Remove any existing tabs in the title section. - self.$dialogTitlebar.find('ul').remove(); // If there are tabs in the page, move them to the titlebar. var $tabs = self.$iframeWindow('ul.primary'); if ($tabs.length) { |