vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TinyMCE wpView:

Browse Source 
- 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@29298 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-07-25 00:55:33 +00:00
parent e11d72f889
commit 67032cf170
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/wp-includes/js/tinymce/plugins/wpview/plugin.js
View File

@ -115,7 +115,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
dom = editor.dom;
// Bail if node is already selected.
if ( viewNode === selected ) {
if ( ! viewNode || viewNode === selected ) {
return;
}
@ -295,34 +295,24 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
if ( view ) {
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();
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 );
if ( event.type === 'click' && ! event.metaKey && ! event.ctrlKey ) {
if ( editor.dom.hasClass( event.target, 'edit' ) ) {
wp.mce.views.edit( view );
} else if ( editor.dom.hasClass( event.target, 'remove' ) ) {
removeView( view );
}
}
// Returning false stops the ugly bars from appearing in IE11 and stops the view being selected as a range in FF.
// Unfortunately, it also inhibits the dragging of views to a new location.
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();
}
}