WordPress 4.7.2-scripts

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / wpautoresize / plugin.js

diff --git a/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js b/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js
index dc1f524437f4a9507ba6a6f8e303410b7956b6c5..98905f6478a67259021bbb1b511530a87b0743b7 100644 (file)
--- a/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js
@@ -25,12 +25,12 @@ tinymce.PluginManager.add( 'wpautoresize', function( editor ) {
                oldSize = 300,
                isActive = false;
 
-       function isFullscreen() {
-               return editor.plugins.fullscreen && editor.plugins.fullscreen.isFullscreen();
+       if ( editor.settings.inline || tinymce.Env.iOS ) {
+               return;
        }
 
-       if ( editor.settings.inline ) {
-               return;
+       function isFullscreen() {
+               return editor.plugins.fullscreen && editor.plugins.fullscreen.isFullscreen();
        }
 
        function getInt( n ) {
@@ -117,7 +117,7 @@ tinymce.PluginManager.add( 'wpautoresize', function( editor ) {
                                resize( e );
                        }
 
-                       editor.fire( 'wp-autoresize', { height: resizeHeight } );
+                       editor.fire( 'wp-autoresize', { height: resizeHeight, deltaHeight: e.type === 'nodechange' ? deltaSize : null } );
                }
        }