diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2008-07-04 10:56:29 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2008-07-04 10:56:29 +0000 |
| commit | 3c14d55021f42359d10b18197bb82f53e446d1f2 (patch) | |
| tree | da905a649d80aa9257ec42fe901359ab643d0647 /ui/ui.dialog.js | |
| parent | 539178291d2a51bfa42a7d604c440a6c813bdf89 (diff) | |
| download | jquery-ui-3c14d55021f42359d10b18197bb82f53e446d1f2.tar.gz jquery-ui-3c14d55021f42359d10b18197bb82f53e446d1f2.zip | |
dialog: added "focus" callback, whenever a dialog is focussed (moveToTop), implements #2728, fixed a couple jslint warnings
Diffstat (limited to 'ui/ui.dialog.js')
| -rw-r--r-- | ui/ui.dialog.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js index bebc5042d..858e9e28b 100644 --- a/ui/ui.dialog.js +++ b/ui/ui.dialog.js @@ -241,8 +241,8 @@ $.widget("ui.dialog", { var container = this.uiDialogContainer, titlebar = this.uiDialogTitlebar, content = this.element, - tbMargin = parseInt(content.css('margin-top')) + parseInt(content.css('margin-bottom')), - lrMargin = parseInt(content.css('margin-left')) + parseInt(content.css('margin-right')); + tbMargin = parseInt(content.css('margin-top'),10) + parseInt(content.css('margin-bottom'),10), + lrMargin = parseInt(content.css('margin-left'),10) + parseInt(content.css('margin-right'),10); content.height(container.height() - titlebar.outerHeight() - tbMargin); content.width(container.width() - lrMargin); }, @@ -272,7 +272,7 @@ $.widget("ui.dialog", { // position on open moveToTop: function(force) { if ((this.options.modal && !force) - || (!this.options.stack && !this.options.modal)) { return; } + || (!this.options.stack && !this.options.modal)) { return this.element.triggerHandler("dialogfocus", [null, { options: this.options }], this.options.focus); } var maxZ = this.options.zIndex, options = this.options; $('.ui-dialog:visible').each(function() { @@ -280,6 +280,8 @@ $.widget("ui.dialog", { }); (this.overlay && this.overlay.$el.css('z-index', ++maxZ)); this.uiDialog.css('z-index', ++maxZ); + + this.element.triggerHandler("dialogfocus", [null, { options: this.options }], this.options.focus); }, close: function() { |