Changeset 40587

Timestamp:

05/09/2017 01:39:49 AM (8 years ago)

Author:

azaozz

Message:

TinyMCE: improve adding of custom UI to the MCE Factory.

Props iseulde.
Fixes #40690.

Location:

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

Files:

• wordpress/plugin.js (modified) (3 diffs)
• wplink/plugin.js (modified) (3 diffs)

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

@@ -683 +683 @@
             mceToolbar,
             mceStatusbar,
-            namesAdded,
             wpStatusbar;
 
@@ -701 +700 @@
 
             each( buttons, function( item ) {
-                var itemName, ui, name;
+                var itemName;
 
                 function bindSelectorChanged() {
@@ -769 +768 @@
                         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 = {

trunk/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() {
@@ -51 +51 @@
             }
         }
-    } );
-
-    tinymce.ui.WPLinkInput = tinymce.ui.Control.extend( {
+    } ) );
+
+    tinymce.ui.Factory.add( 'WPLinkInput', tinymce.ui.Control.extend( {
         renderHtml: function() {
             return (
@@ -83 +83 @@
             urlInput.nextSibling.value = '';
         }
-    } );
+    } ) );
 
     tinymce.PluginManager.add( 'wplink', function( editor ) {