Ticket #6331: 6331.6.diff

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -192 +192 @@
         });
 
         editor.addCommand( 'WP_Code', function() {
-                editor.formatter.toggle('code');
+                var range = editor.selection.getRng();
+                var startContainerFirstBlockParent = editor.dom.getParent(range.startContainer, function(node) {
+                        return editor.dom.isBlock(node);
+                });
+                var endContainerFirstBlockParent = editor.dom.getParent(range.endContainer, function(node) {
+                        return editor.dom.isBlock(node);
+                });
+                var selectionSpansOverBlocks = startContainerFirstBlockParent !== endContainerFirstBlockParent;
+                var selectionSpansEntireBlock = startContainerFirstBlockParent.textContent === editor.selection.getContent({format: 'text'});
+                if ( selectionSpansOverBlocks || selectionSpansEntireBlock ) {
+                        editor.formatter.toggle('pre');
+                } else {
+                        editor.formatter.toggle('code');
+                }
         });
 
         editor.addCommand( 'WP_Page', function() {