From 7d82fb2ee0ebe22f09fc978b30475c7a0f3d7bf3 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Thu, 2 Jun 2016 23:57:32 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@37630 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/tinymce/plugins/wplink/plugin.js | 4 ++-- src/wp-includes/js/wplink.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js index d98c0da694..137e556372 100644 --- a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js @@ -158,7 +158,7 @@ editToolbar = editor.wp._createToolbar( editButtons, true ); 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], selection = linkNode && ( linkNode.textContent || linkNode.innerText ); @@ -475,7 +475,7 @@ var linkNode = editor.dom.getParent( event.element, 'a' ), $linkNode, href, edit; - if ( tinymce.$( document.body ).hasClass( 'modal-open' ) ) { + if ( typeof window.wpLink !== 'undefiend' && window.wpLink.modalOpen ) { editToolbar.tempHide = true; return; } diff --git a/src/wp-includes/js/wplink.js b/src/wp-includes/js/wplink.js index d4511369b1..e3f93dab5f 100644 --- a/src/wp-includes/js/wplink.js +++ b/src/wp-includes/js/wplink.js @@ -19,6 +19,7 @@ var wpLink; keySensitivity: 100, lastSearch: '', textarea: '', + modalOpen: false, init: function() { inputs.wrap = $('#wp-link-wrap'); @@ -97,6 +98,7 @@ var wpLink; $body = $( document.body ); $body.addClass( 'modal-open' ); + wpLink.modalOpen = true; linkNode = node; wpLink.range = null; @@ -274,6 +276,7 @@ var wpLink; close: function( reset ) { $( document.body ).removeClass( 'modal-open' ); + wpLink.modalOpen = false; if ( reset !== 'noReset' ) { if ( ! wpLink.isMCE() ) {