From 6695ac3bab789d47d02cd3c90d62abab2c12c1c6 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sat, 20 Dec 2014 19:33:01 +0000 Subject: [PATCH] Editor: when switching editor-expand off for the first time use the default editor height. Props avryl, fixes #30760 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@30977 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/editor-expand.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/wp-admin/js/editor-expand.js b/src/wp-admin/js/editor-expand.js index 75496c26ce..f5886c60fd 100644 --- a/src/wp-admin/js/editor-expand.js +++ b/src/wp-admin/js/editor-expand.js @@ -682,7 +682,13 @@ } function off() { - var height = window.getUserSetting('ed_size'); + var height = parseInt( window.getUserSetting( 'ed_size', 300 ), 10 ); + + if ( height < 50 ) { + height = 50; + } else if ( height > 5000 ) { + height = 5000; + } // Scroll to the top when triggering this from JS. // Ensures toolbars are reset properly.