Changeset 22514

Timestamp:

11/09/2012 10:36:35 PM (12 years ago)

Author:

nacin

Message:

WordPress dialog jQuery UI widget:

• Link to the upstream bug report.
• No need to specify the default value for an option.
• Use the new _super() UI method to open the dialog, avoiding a direct reference to the parent.
• Fix typo in comment.
• Use public isOpen() method rather than a private property.

props scott.gonzalez.
fixes #22399.

File:

• trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.js (modified) (3 diffs)

trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.js

@@ -1 +1 @@
 (function($){
     $.ui.dialog.prototype.options.closeOnEscape = false;
-    $.widget("wp.wpdialog", $.ui.dialog, {
-        options: {
-            closeOnEscape: false
-        },
+    $.widget('wp.wpdialog', $.ui.dialog, {
+        // Work around a bug in jQuery UI 1.9.1.
+        // http://bugs.jqueryui.com/ticket/8805
         widgetEventPrefix: 'wpdialog',
 
@@ -10 +9 @@
             var ed;
 
-            // Initialize tinyMCEPopup if it exists and is the editor is active.
+            // Initialize tinyMCEPopup if it exists and the editor is active.
             if ( tinyMCEPopup && typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
                 tinyMCEPopup.init();
@@ -16 +15 @@
 
             // Add beforeOpen event.
-            if ( this._isOpen || false === this._trigger('beforeOpen') ) {
+            if ( this.isOpen() || false === this._trigger('beforeOpen') ) {
                 return;
             }
 
             // Open the dialog.
-            $.ui.dialog.prototype.open.apply( this, arguments );
+            this._super();
             // WebKit leaves focus in the TinyMCE editor unless we shift focus.
             this.element.focus();