Changeset 34032

Timestamp:

09/11/2015 01:46:17 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE: ensure the wordpress plugin is loaded before calling _createToolbar().

Props hauvong, azaozz.
Fixes #33393 for 4.3.

Location:

branches/4.3/src/wp-includes/js/tinymce/plugins

Files:

• wpeditimage/plugin.js (modified) (2 diffs)
• wplink/plugin.js (modified) (1 diff)
• wpview/plugin.js (modified) (1 diff)

branches/4.3/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -62 +62 @@
 
         editor.once( 'preinit', function() {
-                toolbar = editor.wp._createToolbar( [
-                        'wp_img_alignleft',
-                        'wp_img_aligncenter',
-                        'wp_img_alignright',
-                        'wp_img_alignnone',
-                        'wp_img_edit',
-                        'wp_img_remove'
-                ] );
+                if ( editor.wp && editor.wp._createToolbar ) {
+                        toolbar = editor.wp._createToolbar( [
+                                'wp_img_alignleft',
+                                'wp_img_aligncenter',
+                                'wp_img_alignright',
+                                'wp_img_alignnone',
+                                'wp_img_edit',
+                                'wp_img_remove'
+                        ] );
+                }
         } );
 
@@ -89 +91 @@
                                         editor.nodeChanged();
                                 }, 200 );
-                        } else {
+                        } else if ( toolbar ) {
                                 toolbar.hide();
                         }

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

@@ -137 +137 @@
 
                 editor.on( 'preinit', function() {
-                        toolbar = editor.wp._createToolbar( [
-                                'wp_link_preview',
-                                'wp_link_edit',
-                                'wp_link_remove'
-                        ], true );
+                        if ( editor.wp && editor.wp._createToolbar ) {
+                                toolbar = editor.wp._createToolbar( [
+                                        'wp_link_preview',
+                                        'wp_link_edit',
+                                        'wp_link_remove'
+                                ], true );
+                        }
                 } );
         } );

branches/4.3/src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -714 +714 @@
 
         editor.once( 'preinit', function() {
-                toolbar = editor.wp._createToolbar( [
-                        'wp_view_edit',
-                        'wp_view_remove'
-                ] );
+                if ( editor.wp && editor.wp._createToolbar ) {
+                        toolbar = editor.wp._createToolbar( [
+                                'wp_view_edit',
+                                'wp_view_remove'
+                        ] );
+                }
         } );