diff options
| author | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
| commit | 27a7deebf299e1673e8b452476be02e486bba2c6 (patch) | |
| tree | 79521a78ab770ebd7ee167575b680f14d3ed4089 /ui/jquery.ui.dialog.js | |
| parent | 4dcfeee8d54d81db4d5af8b2fd189b799cd9561e (diff) | |
| parent | 85ac420a1e4281ee7f361e847d3cad72fa58525e (diff) | |
| download | jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.tar.gz jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.zip | |
Merge branch 'master' into effects-unit
Conflicts:
ui/jquery.effects.pulsate.js
Diffstat (limited to 'ui/jquery.ui.dialog.js')
| -rw-r--r-- | ui/jquery.ui.dialog.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 8423d1164..2138a9a58 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -281,7 +281,7 @@ $.widget("ui.dialog", { options = self.options, uiDialog = self.uiDialog; - self.overlay = options.modal ? new $.ui.dialog.overlay( self ) : null; + self.overlay = options.modal ? new $.ui.dialog.overlay( self ) : null; self._size(); self._position( options.position ); uiDialog.show( options.show ); |