sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Editor: pass the DOM library instance instead of a (fake) editor instance to `getCursorMarkerSpan()`. 

See #42029

git-svn-id: https://develop.svn.wordpress.org/trunk@41655 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2017-10-01 09:41:23 +00:00
parent 84daf097a0
commit d36c32e299
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wp-admin/js/editor.js
View File

@ -345,11 +345,11 @@ window.wp = window.wp || {};
* *
* Using DomQuery syntax to create it, since it's used as both text and as a DOM element. * Using DomQuery syntax to create it, since it's used as both text and as a DOM element.
* *
* @param {Object} editor The TinyMCE editor instance. * @param {Object} domLib DOM library instance.
* @param {string} content The content to insert into the cusror marker element. * @param {string} content The content to insert into the cusror marker element.
*/ */
function getCursorMarkerSpan( editor, content ) { function getCursorMarkerSpan( domLib, content ) {
return editor.$( '<span>' ).css( { return domLib( '<span>' ).css( {
display: 'inline-block', display: 'inline-block',
width: 0, width: 0,
overflow: 'hidden', overflow: 'hidden',
@ -434,9 +434,8 @@ window.wp = window.wp || {};
* to run after the markers are added. * to run after the markers are added.
* *
* @param {object} $textarea TinyMCE's textarea wrapped as a DomQuery object * @param {object} $textarea TinyMCE's textarea wrapped as a DomQuery object
* @param {object} jQuery A jQuery instance
*/ */
function addHTMLBookmarkInTextAreaContent( $textarea, jQuery ) { function addHTMLBookmarkInTextAreaContent( $textarea ) {
if ( ! $textarea || ! $textarea.length ) { if ( ! $textarea || ! $textarea.length ) {
// If no valid $textarea object is provided, there's nothing we can do. // If no valid $textarea object is provided, there's nothing we can do.
return; return;
@ -456,7 +455,7 @@ window.wp = window.wp || {};
mode = htmlModeCursorStartPosition !== htmlModeCursorEndPosition ? 'range' : 'single', mode = htmlModeCursorStartPosition !== htmlModeCursorEndPosition ? 'range' : 'single',
selectedText = null, selectedText = null,
cursorMarkerSkeleton = getCursorMarkerSpan( { $: jQuery }, '&#65279;' ); cursorMarkerSkeleton = getCursorMarkerSpan( $$, '&#65279;' );
if ( mode === 'range' ) { if ( mode === 'range' ) {
var markedText = textArea.value.slice( htmlModeCursorStartPosition, htmlModeCursorEndPosition ), var markedText = textArea.value.slice( htmlModeCursorStartPosition, htmlModeCursorEndPosition ),
@ -646,7 +645,7 @@ window.wp = window.wp || {};
* The elements have hardcoded style that makes them invisible. This is done to avoid seeing * The elements have hardcoded style that makes them invisible. This is done to avoid seeing
* random content flickering in the editor when switching between modes. * random content flickering in the editor when switching between modes.
*/ */
var spanSkeleton = getCursorMarkerSpan( editor, selectionID ), var spanSkeleton = getCursorMarkerSpan( editor.$, selectionID ),
startElement = spanSkeleton.clone().addClass( 'mce_SELRES_start' ), startElement = spanSkeleton.clone().addClass( 'mce_SELRES_start' ),
endElement = spanSkeleton.clone().addClass( 'mce_SELRES_end' ); endElement = spanSkeleton.clone().addClass( 'mce_SELRES_end' );