diff options
author | Scott González <scott.gonzalez@gmail.com> | 2012-04-20 11:06:11 -0400 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2012-04-20 11:06:11 -0400 |
commit | 308b55e50ca781ad9db08a252f313ee2e8e2f257 (patch) | |
tree | b287b6936d45efdfe067d2bdf4c732b13a1726bd /ui/jquery.ui.dialog.js | |
parent | 2cf9948cadf45a24c591d6f7232f2470b4d9743e (diff) | |
parent | 33df9b788d3f60459c43acbfefdfeef8a07ce632 (diff) | |
download | jquery-ui-308b55e50ca781ad9db08a252f313ee2e8e2f257.tar.gz jquery-ui-308b55e50ca781ad9db08a252f313ee2e8e2f257.zip |
Merge branch 'master' into position-notification
Diffstat (limited to 'ui/jquery.ui.dialog.js')
-rw-r--r-- | ui/jquery.ui.dialog.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 3a9bd5dc6..144cf9725 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -77,10 +77,10 @@ $.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.oldPosition = { + parent: this.element.parent(), + index: this.element.parent().children().index( this.element ) }; this.options.title = this.options.title || this.originalTitle; var self = this, @@ -171,7 +171,7 @@ $.widget("ui.dialog", { }, _destroy: function() { - var self = this, next, + var self = this, next, oldPosition = this.oldPosition; if ( self.overlay ) { @@ -187,13 +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() { |