Ticket #40690: 40690.patch

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -682 +682 @@
                         mceIframe = document.getElementById( editor.id + '_ifr' ),
                         mceToolbar,
                         mceStatusbar,
-                        namesAdded,
                         wpStatusbar;
 
                         if ( container ) {
@@ -700 +699 @@
                                 buttonGroup;
 
                         each( buttons, function( item ) {
-                                var itemName, ui, name;
+                                var itemName;
 
                                 function bindSelectorChanged() {
                                         var selection = editor.selection;
@@ -768 +767 @@
 
                                                 buttonGroup = null;
                                         } else {
-                                                // Add the new WP* types to the factory
-                                                if ( ! namesAdded ) {
-                                                        ui = tinymce.ui;
-
-                                                        for ( name in ui ) {
-                                                                if ( name.toLowerCase().indexOf( 'wp' ) === 0 ) {
-                                                                        Factory.add( name, ui[name] );
-                                                                }
-                                                        }
-
-                                                        namesAdded = true;
-                                                }
-
                                                 if ( ! buttonGroup ) {
                                                         buttonGroup = {
                                                                 type: 'buttongroup',

src/wp-includes/js/tinymce/plugins/wplink/plugin.js

@@ -1 +1 @@
 ( function( tinymce ) {
-        tinymce.ui.WPLinkPreview = tinymce.ui.Control.extend( {
+        tinymce.ui.Factory.add( 'WPLinkPreview', tinymce.ui.Control.extend( {
                 url: '#',
                 renderHtml: function() {
                         return (
@@ -50 +50 @@
                                 tinymce.$( this.getEl().firstChild ).attr( 'href', this.url ).text( url );
                         }
                 }
-        } );
+        } ) );
 
-        tinymce.ui.WPLinkInput = tinymce.ui.Control.extend( {
+        tinymce.ui.Factory.add( 'WPLinkInput', tinymce.ui.Control.extend( {
                 renderHtml: function() {
                         return (
                                 '<div id="' + this._id + '" class="wp-link-input">' +
@@ -82 +82 @@
                         urlInput.value = '';
                         urlInput.nextSibling.value = '';
                 }
-        } );
+        } ) );
 
         tinymce.PluginManager.add( 'wplink', function( editor ) {
                 var toolbar;