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

#683128 by aspilicious: Fixed Multiple 'add to shortcut' links appearing when adding fields.

merge-requests/26/head
Angie Byron 2010-01-13 23:13:18 +00:00
parent 0c79ed846d
commit 6a5532a258
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,6 +417,8 @@ Drupal.overlay.bindChild = function (iframeWindow, isClosing) {
// Add a title attribute to the iframe for accessibility. // Add a title attribute to the iframe for accessibility.
self.$iframe.attr('title', Drupal.t('@title dialog', { '@title': iframeTitle })); 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. // If the shortcut add/delete button exists, move it to the dialog title.
var $addToShortcuts = self.$iframeWindow('.add-or-remove-shortcuts'); var $addToShortcuts = self.$iframeWindow('.add-or-remove-shortcuts');
if ($addToShortcuts.length) { if ($addToShortcuts.length) {
@ -428,6 +430,8 @@ Drupal.overlay.bindChild = function (iframeWindow, isClosing) {
self.$dialogTitlebar.find('.ui-dialog-title').after($addToShortcuts); 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. // If there are tabs in the page, move them to the titlebar.
var $tabs = self.$iframeWindow('ul.primary'); var $tabs = self.$iframeWindow('ul.primary');
if ($tabs.length) { if ($tabs.length) {