From 492b8db722f0c4da6fca2d6e3b1fe43ac1e7d264 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 5 Dec 2014 01:52:46 +0000
Subject: [PATCH] Editor: fix initial state for editor-expand when TinyMCE is
 disabled or not supported. Props avryl, fixes #30592.

git-svn-id: https://develop.svn.wordpress.org/trunk@30743 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/js/editor-expand.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/js/editor-expand.js b/src/wp-admin/js/editor-expand.js
index cbe910de75..677a43297f 100644
--- a/src/wp-admin/js/editor-expand.js
+++ b/src/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 = {