WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Ozz 2014-12-05 01:53:22 +00:00
parent 1cf7a49ffd
commit 0a199ff4a8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/js/editor-expand.js
View File

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

2
wp-admin/js/editor-expand.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.