Changeset 44718

Timestamp:

01/30/2019 02:11:01 PM (6 years ago)

Author:

azaozz

Message:

TinyMCE: fix external references in wpview and wpemoji plugins in the Classic Block instance when running from /build.

Fixes #46147.

Location:

trunk/src/js/_enqueues/vendor/tinymce/plugins

Files:

• wpemoji/plugin.js (modified) (2 diffs)
• wpview/plugin.js (modified) (2 diffs)

trunk/src/js/_enqueues/vendor/tinymce/plugins/wpemoji/plugin.js

@@ -1 @@
-( function( tinymce, wp, settings ) {
+( function( tinymce ) {
     tinymce.PluginManager.add( 'wpemoji', function( editor ) {
         var typing,
+            wp = window.wp,
+            settings = window._wpemojiSettings,
             env = tinymce.Env,
             ua = window.navigator.userAgent,
@@ -126 +128 @@
         } );
     } );
-} )( window.tinymce, window.wp, window._wpemojiSettings );
+} )( window.tinymce );

trunk/src/js/_enqueues/vendor/tinymce/plugins/wpview/plugin.js

@@ -2 +2 @@
  * WordPress View plugin.
  */
-( function( tinymce, wp ) {
+( function( tinymce ) {
     tinymce.PluginManager.add( 'wpview', function( editor ) {
         function noop () {}
+
+        // Set this here as wp-tinymce.js may be loaded too early.
+        var wp = window.wp;
 
         if ( ! wp || ! wp.mce || ! wp.mce.views ) {
@@ -200 +203 @@
         };
     } );
-} )( window.tinymce, window.wp );
+} )( window.tinymce );