Changeset 36777

Timestamp:

02/29/2016 07:37:42 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE, inline link:

• Fix running wpLink without tinymce.js and the TinyMCE plugin without wplink.js.
• Do not show the Advanced button in the inline link dialog when wpLink is not loaded.

See #33301.

Location:

trunk/src/wp-includes/js

Files:

• tinymce/plugins/wplink/plugin.js (modified) (2 diffs)
• wplink.js (modified) (9 diffs)

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

@@ -145 +145 @@
                                 ], true );
 
-                                editToolbar = editor.wp._createToolbar( [
+                                var editButtons = [
                                         'wp_link_input',
-                                        'wp_link_apply',
-                                        'wp_link_advanced'
-                                ], true );
+                                        'wp_link_apply'
+                                ];
+
+                                if ( typeof window.wpLink !== 'undefined' ) {
+                                        editButtons.push( 'wp_link_advanced' );
+                                }
+
+                                editToolbar = editor.wp._createToolbar( editButtons, true );
 
                                 editToolbar.on( 'show', function() {
@@ -178 +183 @@
 
                 editor.addCommand( 'WP_Link', function() {
-                        if ( tinymce.Env.ie && tinymce.Env.ie < 10 ) {
-                                if ( typeof window.wpLink !== 'undefined' ) {
-                                        window.wpLink.open( editor.id );
-                                }
-
+                        if ( tinymce.Env.ie && tinymce.Env.ie < 10 && typeof window.wpLink !== 'undefined' ) {
+                                window.wpLink.open( editor.id );
                                 return;
                         }

trunk/src/wp-includes/js/wplink.js

@@ -1 @@
-/* global tinymce, wpLinkL10n, wpActiveEditor */
+
 var wpLink;
 
-( function( $ ) {
+( function( $, wpLinkL10n ) {
         var editor, correctedURL, linkNode,
                 inputs = {},
@@ -81 +81 @@
                                         $input.val( ui.item.permalink );
 
-                                        if ( inputs.wrap.hasClass( 'has-text-field' ) && tinymce.trim( inputs.text.val() ) === '' ) {
+                                        if ( inputs.wrap.hasClass( 'has-text-field' ) && $.trim( inputs.text.val() ) === '' ) {
                                                 inputs.text.val( ui.item.title );
                                         }
@@ -145 +145 @@
                         this.textarea = $( '#' + window.wpActiveEditor ).get( 0 );
 
-                        if ( typeof tinymce !== 'undefined' ) {
+                        if ( typeof window.tinymce !== 'undefined' ) {
                                 // Make sure the link wrapper is the last element in the body,
                                 // or the inline editor toolbar may show above the backdrop.
                                 $body.append( inputs.backdrop, inputs.wrap );
 
-                                ed = tinymce.get( wpActiveEditor );
+                                ed = window.tinymce.get( window.wpActiveEditor );
 
                                 if ( ed && ! ed.isHidden() ) {
@@ -158 +158 @@
                                 }
 
-                                if ( editor && tinymce.isIE && ! editor.windowManager.wplinkBookmark ) {
+                                if ( editor && window.tinymce.isIE && ! editor.windowManager.wplinkBookmark ) {
                                         editor.windowManager.wplinkBookmark = editor.selection.getBookmark();
                                 }
@@ -237 +237 @@
                                         node = nodes[i];
 
-                                        if ( node.nodeType != 3 && ! tinymce.dom.BookmarkManager.isBookmarkNode( node ) ) {
+                                        if ( node.nodeType != 3 && ! window.tinymce.dom.BookmarkManager.isBookmarkNode( node ) ) {
                                                 return false;
                                         }
@@ -254 +254 @@
                                 linkText = linkNode.innerText || linkNode.textContent;
 
-                                if ( ! tinymce.trim( linkText ) ) {
+                                if ( ! $.trim( linkText ) ) {
                                         linkText = text || '';
                                 }
@@ -398 +398 @@
                         editor.focus();
 
-                        if ( tinymce.isIE && editor.windowManager.wplinkBookmark ) {
+                        if ( window.tinymce.isIE && editor.windowManager.wplinkBookmark ) {
                                 editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
                                 editor.windowManager.wplinkBookmark = null;
@@ -475 +475 @@
                         }
 
-                        selection = tinymce.trim( selection );
+                        selection = $.trim( selection );
 
                         if ( selection && emailRegexp.test( selection ) ) {
@@ -497 +497 @@
 
         $( document ).ready( wpLink.init );
-})( jQuery );
+})( jQuery, window.wpLinkL10n );