Changeset 37630

Timestamp:

06/02/2016 11:57:32 PM (9 years ago)

Author:

azaozz

Message:

Editor: do not use the modal-open class to determine when the wpLink modal is open. This is a class used in Bootstrap and may be present when wpLink is not open. Store the open/closed state instead.

Fixes #36662.

Location:

trunk/src/wp-includes/js

Files:

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

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

@@ -159 +159 @@
 
                 editToolbar.on( 'show', function() {
-                    if ( ! tinymce.$( document.body ).hasClass( 'modal-open' ) ) {
+                    if ( typeof window.wpLink === 'undefiend' || ! window.wpLink.modalOpen ) {
                         window.setTimeout( function() {
                             var element = editToolbar.$el.find( 'input.ui-autocomplete-input' )[0],
@@ -476 +476 @@
                 $linkNode, href, edit;
 
-            if ( tinymce.$( document.body ).hasClass( 'modal-open' ) ) {
+            if ( typeof window.wpLink !== 'undefiend' && window.wpLink.modalOpen ) {
                 editToolbar.tempHide = true;
                 return;

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

@@ -20 +20 @@
         lastSearch: '',
         textarea: '',
+        modalOpen: false,
 
         init: function() {
@@ -98 +99 @@
 
             $body.addClass( 'modal-open' );
+            wpLink.modalOpen = true;
             linkNode = node;
 
@@ -275 +277 @@
         close: function( reset ) {
             $( document.body ).removeClass( 'modal-open' );
+            wpLink.modalOpen = false;
 
             if ( reset !== 'noReset' ) {