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

TinyMCE: fix vertical positioning of the image toolbar when there are several instances of the editor. Props avryl, fixes #31028. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@31216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-01-18 17:56:23 +00:00
parent 7d2ec003da
commit 00436f6886
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
View File

@ -176,7 +176,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
windowPos = window.pageYOffset || document.documentElement.scrollTop; windowPos = window.pageYOffset || document.documentElement.scrollTop;
adminbar = tinymce.$( '#wpadminbar' )[0]; adminbar = tinymce.$( '#wpadminbar' )[0];
mceToolbar = tinymce.$( '.mce-tinymce .mce-toolbar-grp' )[0]; mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0];
boundary = imageNode.getBoundingClientRect(); boundary = imageNode.getBoundingClientRect();
boundaryMiddle = ( boundary.left + boundary.right ) / 2; boundaryMiddle = ( boundary.left + boundary.right ) / 2;
boundaryVerticalMiddle = ( boundary.top + boundary.bottom ) / 2; boundaryVerticalMiddle = ( boundary.top + boundary.bottom ) / 2;

2
wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31234'; $wp_version = '4.2-alpha-31235';
/** /**
* 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.