Changeset 41655

Timestamp:

10/01/2017 09:41:23 AM (9 years ago)

Author:

azaozz

Message:

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

See #42029

File:

• trunk/src/wp-admin/js/editor.js (modified) (4 diffs)

trunk/src/wp-admin/js/editor.js

@@ -346 +346 @@
                  * 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.
                  */
-                function getCursorMarkerSpan( editor, content ) {
-                        return editor.$( '<span>' ).css( {
+                function getCursorMarkerSpan( domLib, content ) {
+                        return domLib( '<span>' ).css( {
                                                 display: 'inline-block',
                                                 width: 0,
@@ -435 +435 @@
                  *
                  * @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 no valid $textarea object is provided, there's nothing we can do.
@@ -457 +456 @@
 
                                 selectedText = null,
-                                cursorMarkerSkeleton = getCursorMarkerSpan( { $: jQuery }, '&#65279;' );
+                                cursorMarkerSkeleton = getCursorMarkerSpan( $$, '&#65279;' );
 
                         if ( mode === 'range' ) {
@@ -647 +646 @@
                          * 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' ),
                                 endElement = spanSkeleton.clone().addClass( 'mce_SELRES_end' );