Editor: fix initial state for editor-expand when TinyMCE is disabled or not supported. Props avryl, fixes #30592.

Built from https://develop.svn.wordpress.org/trunk@30743


git-svn-id: http://core.svn.wordpress.org/trunk@30733 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/js/editor-expand.js

@@ -36,7 +36,7 @@
 			pinnedToolsTop = 56,
 			sidebarBottom = 20,
 			autoresizeMinHeight = 300,
-			initialMode = window.getUserSetting( 'editor' ),
+			initialMode = $contentWrap.hasClass( 'tmce-active' ) ? 'tinymce' : 'html',
 			advanced = !! parseInt( window.getUserSetting( 'hidetb' ), 10 ),
 			// These are corrected when adjust() runs, except on scrolling if already set.
 			heights = {

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30742';
+$wp_version = '4.1-beta2-30743';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.