jQuery UI Development

Timestamp:

07/09/08 19:45:49 (21 months ago)

Author:

scott.gonzalez

Message:

Dialog: Use new trigger method from the widget factory.

Files:

• trunk/ui/ui.dialog.js (modified) (4 diffs)

trunk/ui/ui.dialog.js

@@ -268 +268 @@
                 this.moveToTop(true);
                 
-                // CALLBACK: open
-                var openEV = this.fakeEvent('dialogopen');
-                var openUI = {
-                        options: this.options
-                };
-                this.uiDialogTitlebarClose.focus();
-                this.element.triggerHandler("dialogopen", [openEV, openUI], this.options.open);
-                
+                this.trigger('open', null, { options: this.options });
                 this.isOpen = true;
         },
@@ -285 +278 @@
                 if ((this.options.modal && !force)
                         || (!this.options.stack && !this.options.modal)) {
-                        return this.element.triggerHandler("dialogfocus",
-                                [this.fakeEvent('dialogfocus'), { options: this.options }],
-                                this.options.focus);
+                        return this.trigger('focus', null, { options: this.options });
                 }
                 
@@ -297 +288 @@
                 this.uiDialog.css('z-index', ++maxZ);
                 
-                this.element.triggerHandler("dialogfocus",
-                        [this.fakeEvent('dialogfocus'), { options: this.options }],
-                        this.options.focus);
+                this.trigger('focus', null, { options: this.options });
         },
         
@@ -305 +294 @@
                 (this.overlay && this.overlay.destroy());
                 this.uiDialog.hide(this.options.hide);
-
-                // CALLBACK: close
-                var closeEV = this.fakeEvent('dialogclose');
-                var closeUI = {
-                        options: this.options
-                };
-                this.element.triggerHandler("dialogclose", [closeEV, closeUI], this.options.close);
+                
+                this.trigger('close', null, { options: this.options });
                 $.ui.dialog.overlay.resize();