Changeset 29126

Timestamp:

07/12/2014 10:50:19 PM (5 years ago)

Author:

azaozz

Message:

TinyMCE wpView: fix selecting views on click, part props avryl, see #28595

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (2 diffs)

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

@@ -13 +13 @@
 
     function getView( node ) {
-        // Doing this directly is about 40% faster
+        return getParent( node, 'wpview-wrap' );
+    }
+
+    /**
+     * Returns the node or a parent of the node that has the passed className.
+     * Doing this directly is about 40% faster
+     */
+    function getParent( node, className ) {
         while ( node && node.parentNode ) {
-            if ( node.className && (' ' + node.className + ' ').indexOf(' wpview-wrap ') !== -1 ) {
+            if ( node.className && (' ' + node.className + ' ').indexOf(' ' + className + ' ') !== -1 ) {
                 return node;
             }
@@ -624 +631 @@
                 // If the cursor lands anywhere else in the view, set the cursor before it.
                 // Only try this once to prevent a loop. (You never know.)
-                } else if ( className !== 'wpview-clipboard' && ! setViewCursorTries ) {
+                } else if ( ! getParent( event.element, 'wpview-body' ) && ! setViewCursorTries ) {
                     deselect();
                     setViewCursorTries++;