Changeset 42442 for branches/4.9

Timestamp:

01/13/2018 11:27:54 AM (7 years ago)

Author:

azaozz

Message:

Merged revision 42430 from trunk:
Editor: ensure there is a selection before getting the caret position. Fixes a bug in Firefox when there is no selection for a hidden element.

Props johnschulz, azaozz.

Fixes #43012 for 4.9.2.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/js/editor.js (modified) (1 diff)

branches/4.9/src/wp-admin/js/editor.js

@@ -696 +696 @@
         function findBookmarkedPosition( editor ) {
             // Get the TinyMCE `window` reference, since we need to access the raw selection.
-            var TinyMCEWIndow = editor.getWin(),
-                selection = TinyMCEWIndow.getSelection();
-
-            if ( selection.rangeCount <= 0 ) {
+            var TinyMCEWindow = editor.getWin(),
+                selection = TinyMCEWindow.getSelection();
+
+            if ( ! selection || selection.rangeCount < 1 ) {
                 // no selection, no need to continue.
                 return;