Changeset 30906

Timestamp:

12/16/2014 03:10:19 PM (12 years ago)

Author:

johnbillion

Message:

TinyMCE: remove reposition delay on showing the image toolbar. Not needed when no animation.

Merges [30829] to the 4.1 branch.

Fixes #30670.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-includes/css/editor.css (modified) (2 diffs)
• src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (1 diff)

branches/4.1/src/wp-includes/css/editor.css

@@ -166 +166 @@
         margin-bottom: 8px;
         position: absolute;
+        visibility: hidden;
         -moz-user-select: none;
         -webkit-user-select: none;
@@ -255 +256 @@
         width: 100%;
         overflow-x: auto;
+}
+
+div.mce-inline-toolbar-grp-active {
+        visibility: visible;
 }
 

branches/4.1/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -310 +310 @@
 
         floatingToolbar.on( 'show', function() {
-                var self = this;
-
                 toolbarIsHidden = false;
 
-                setTimeout( function() {
-                        if ( self._visible ) {
-                                DOM.addClass( self.getEl(), 'mce-inline-toolbar-grp-active' );
-                                self.reposition();
-                        }
-                }, 100 );
+                if ( this._visible ) {
+                        this.reposition();
+                        DOM.addClass( this.getEl(), 'mce-inline-toolbar-grp-active' );
+                }
         } );