From 595cd943bf20c82a7feb3ef78e56b264624b5a99 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Fri, 9 Nov 2012 22:36:35 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@22514 602fd350-edb4-49c9-b593-d223f7449a82 --- .../js/tinymce/plugins/wpdialogs/js/wpdialog.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.js b/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.js index a846fd0d6e..cb168ddfad 100644 --- a/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.js +++ b/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.js @@ -1,26 +1,25 @@ (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', open: function() { 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(); } // 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(); this._trigger('refresh');