Changeset 29298

Timestamp:

07/25/2014 12:55:33 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE wpView:

• Fix opening the media modal on clicking Edit in Firefox.
• Fix range errors when restoring the selection bookmark in IE11 after editing a view.

See #28595.

File:

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

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

@@ -116 +116 @@
 
                 // Bail if node is already selected.
-                if ( viewNode === selected ) {
+                if ( ! viewNode || viewNode === selected ) {
                         return;
                 }
@@ -296 +296 @@
                                 event.stopPropagation();
 
-                                // Hack to try and keep the block resize handles from appearing. They will show on mousedown and then be removed on mouseup.
-                                if ( Env.ie <= 10 ) {
-                                        deselect();
-                                }
-
-                                select( view );
-
-                                if ( event.type === 'click' && ! event.metaKey && ! event.ctrlKey ) {
+                                if ( event.type === 'mousedown' && ! event.metaKey && ! event.ctrlKey ) {
                                         if ( editor.dom.hasClass( event.target, 'edit' ) ) {
                                                 wp.mce.views.edit( view );
+                                                editor.focus();
+                                                return false;
                                         } else if ( editor.dom.hasClass( event.target, 'remove' ) ) {
                                                 removeView( view );
-                                        }
-                                }
+                                                return false;
+                                        }
+                                }
+
+                                select( view );
 
                                 // Returning false stops the ugly bars from appearing in IE11 and stops the view being selected as a range in FF.
@@ -315 +313 @@
                                 return false;
                         } else {
-                                // Fix issue with deselecting a view in IE8. Without this hack, clicking content above the view wouldn't actually deselect it
-                                // and the caret wouldn't be placed at the mouse location
-                                if ( Env.ie && Env.ie <= 8 ) {
-                                        deselectEventType = 'mouseup';
-                                } else {
-                                        deselectEventType = 'mousedown';
-                                }
-
-                                if ( event.type === deselectEventType ) {
+                                if ( event.type === 'mousedown' ) {
                                         deselect();
                                 }