Skip to content
Permalink
Browse files

Merge pull request #553 from AlbertoMonteiro/master

Dialog: When destroy is called place the element back in original DOM position. Fixed #4980 - Dialog: Destroy should place element back in original DOM position
  • Loading branch information...
scottgonzalez committed Dec 15, 2011
2 parents cf1470d + a4b7fea commit 76c7bf6c3ffbe4952b4cfd50443ff13745202605
Showing with 23 additions and 3 deletions.
  1. +9 −0 tests/unit/dialog/dialog_tickets.js
  2. +14 −3 ui/jquery.ui.dialog.js
@@ -140,4 +140,13 @@ test("#6966: Escape key closes all dialogs, not the top one", function(){
d1.remove();
});

test("#4980: Destroy should place element back in original DOM position", function(){
container = $('<div id="container"><div id="modal">Content</div></div>');
modal = container.find('#modal');
modal.dialog();
ok(!$.contains(container[0], modal[0]), 'dialog should move modal element to outside container element');
modal.dialog('destroy');
ok($.contains(container[0], modal[0]), 'dialog(destroy) should place element back in original DOM position');
});

})(jQuery);
@@ -77,8 +77,11 @@ $.widget("ui.dialog", {
// #5742 - .attr() might return a DOMElement
if ( typeof this.originalTitle !== "string" ) {
this.originalTitle = "";
}

}
this.oldPosition = {
parent: this.element.parent(),
index: this.element.parent().children().index( this.element )
};
this.options.title = this.options.title || this.originalTitle;
var self = this,
options = self.options,
@@ -168,7 +171,8 @@ $.widget("ui.dialog", {
},

_destroy: function() {
var self = this;
var self = this, next,
oldPosition = this.oldPosition;

if ( self.overlay ) {
self.overlay.destroy();
@@ -183,6 +187,13 @@ $.widget("ui.dialog", {
if ( self.originalTitle ) {
self.element.attr( "title", self.originalTitle );
}

next = oldPosition.parent.children().eq( oldPosition.index );
if ( next.length ) {
next.before( self.element );
} else {
oldPosition.parent.append( self.element );
}
},

widget: function() {

0 comments on commit 76c7bf6

Please sign in to comment.
You can’t perform that action at this time.