Changeset 26900

Timestamp:

01/04/2014 01:27:59 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE: 'wpdialogs' plugin, don't add the (external) UI dialogs element to the internal windows array, fix .close(). See #24067.

Location:

trunk/src/wp-includes/js/tinymce/plugins

Files:

• wpdialogs/plugin.js (modified) (5 diffs)
• wpeditimage/plugin.js (modified) (1 diff)

trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js

@@ -9 +9 @@
  */
 tinymce.WPWindowManager = tinymce.InlineWindowManager = function( editor ) {
+    if ( this.wp ) {
+        return this;
+    }
 
+    this.wp = {};
     this.parent = editor.windowManager;
     this.editor = editor;
@@ -16 +20 @@
 
     this.open = function( args, params ) {
-        var self = this, $element;
+        var $element,
+            self = this,
+            wp = this.wp;
 
         if ( ! args.wpDialog ) {
-            return this.parent.open( args, params );
+            return this.parent.open.apply( this, arguments );
         } else if ( ! args.id ) {
             return;
         }
 
-        self.element = $element = jQuery( '#' + args.id );
+        wp.$element = $element = jQuery( '#' + args.id );
 
         if ( ! $element.length ) {
@@ -34 +40 @@
         }
 
-        self.features = args;
-        self.params = params;
-        self.windows.push( $element );
+        wp.features = args;
+        wp.params = params;
 
         // Store selection. Takes a snapshot in the FocusManager of the selection before focus is moved to the dialog.
@@ -56 +61 @@
 
         $element.on( 'wpdialogclose', function() {
-            var i = self.windows.length;
-
-            while ( i-- && i > -1 ) {
-                if ( self.windows[i] === self.element ) {
-                    self.windows.splice( i, 1 );
-                }
+            if ( self.wp.$element ) {
+                self.wp = {};
             }
         });
@@ -67 +68 @@
 
     this.close = function() {
-        if ( ! this.features.wpDialog ) {
+        if ( ! this.wp.features || ! this.wp.features.wpDialog ) {
             return this.parent.close.apply( this, arguments );
         }
 
-        this.element.wpdialog('close');
+        this.wp.$element.wpdialog('close');
     };
-}
+};
 
 tinymce.PluginManager.add( 'wpdialogs', function( editor ) {

trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -58 +58 @@
 
                 if ( out && out[1] ) {
-                    return '<p>' + out[1] + '</p>'
+                    return '<p>' + out[1] + '</p>';
                 }