From 73e4f3e13b26d0d6ab1336f50187b066cc772562 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 6 Jun 2014 02:11:02 +0000 Subject: [PATCH] wpView: use `data-mce-selected` instead of adding a class to mark a view as selected. This prevents adding an unneeded undo level. Props avryl, fixes #28313 git-svn-id: https://develop.svn.wordpress.org/trunk@28684 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/tinymce/plugins/wpview/plugin.js | 4 ++-- .../js/tinymce/skins/wordpress/wp-content.css | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/wp-includes/js/tinymce/plugins/wpview/plugin.js b/src/wp-includes/js/tinymce/plugins/wpview/plugin.js index 4eede11e1f..bbf9436efc 100644 --- a/src/wp-includes/js/tinymce/plugins/wpview/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wpview/plugin.js @@ -73,7 +73,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) { deselect(); selected = viewNode; - dom.addClass( viewNode, 'selected' ); + dom.setAttrib( viewNode, 'data-mce-selected', 1 ); clipboard = dom.create( 'div', { 'class': 'wpview-clipboard', @@ -109,7 +109,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) { dom.remove( clipboard ); dom.unbind( selected, 'beforedeactivate focusin focusout click mouseup', _stop ); - dom.removeClass( selected, 'selected' ); + dom.setAttrib( selected, 'data-mce-selected', null ); } selected = null; diff --git a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css index 4ada8310d0..cb9b865cb9 100644 --- a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css +++ b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css @@ -231,13 +231,13 @@ audio { border: 1px solid transparent; } -.wpview-wrap.selected { +.wpview-wrap[data-mce-selected] { background-color: rgba(0,0,0,0.1); border-color: rgba(0,0,0,0.3); } -.ie8 .wpview-wrap.selected, -.ie7 .wpview-wrap.selected { +.ie8 .wpview-wrap[data-mce-selected], +.ie7 .wpview-wrap[data-mce-selected] { background-color: #e5e5e5; border-color: #777; } @@ -250,7 +250,7 @@ audio { left: 0; } -.wpview-wrap.selected .wpview-overlay { +.wpview-wrap[data-mce-selected] .wpview-overlay { display: none; } @@ -262,7 +262,7 @@ audio { z-index: 100; } -.wpview-wrap.selected .toolbar { +.wpview-wrap[data-mce-selected] .toolbar { display: block; } @@ -310,7 +310,7 @@ audio { margin: 0; } -.selected .wpview-error { +.wpview-wrap[data-mce-selected] .wpview-error { border-color: transparent; } @@ -328,7 +328,6 @@ audio { font-family: 'Open Sans', sans-serif; } - .wpview-wrap .toolbar div:hover, #wp-image-toolbar i:hover { box-shadow: 0 1px 3px rgba(0,0,0,0.8);