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

Merges [30829] to the 4.1 branch.

Fixes #30670.

Built from https://develop.svn.wordpress.org/branches/4.1@30906


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2014-12-16 15:11:22 +00:00
parent a4b0effcb6
commit 88cd5c58d2
7 changed files with 17 additions and 11 deletions

View File

@ -165,6 +165,7 @@ div.mce-inline-toolbar-grp {
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 8px; margin-bottom: 8px;
position: absolute; position: absolute;
visibility: hidden;
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
-ms-user-select: none; -ms-user-select: none;
@ -256,6 +257,10 @@ div.mce-inline-toolbar-grp.mce-arrow-full > div {
overflow-x: auto; overflow-x: auto;
} }
div.mce-inline-toolbar-grp-active {
visibility: visible;
}
div.mce-toolbar-grp > div { div.mce-toolbar-grp > div {
padding: 3px; padding: 3px;
} }

File diff suppressed because one or more lines are too long

View File

@ -165,6 +165,7 @@ div.mce-inline-toolbar-grp {
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 8px; margin-bottom: 8px;
position: absolute; position: absolute;
visibility: hidden;
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
-ms-user-select: none; -ms-user-select: none;
@ -256,6 +257,10 @@ div.mce-inline-toolbar-grp.mce-arrow-full > div {
overflow-x: auto; overflow-x: auto;
} }
div.mce-inline-toolbar-grp-active {
visibility: visible;
}
div.mce-toolbar-grp > div { div.mce-toolbar-grp > div {
padding: 3px; padding: 3px;
} }

File diff suppressed because one or more lines are too long

View File

@ -309,16 +309,12 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
} }
floatingToolbar.on( 'show', function() { floatingToolbar.on( 'show', function() {
var self = this;
toolbarIsHidden = false; toolbarIsHidden = false;
setTimeout( function() { if ( this._visible ) {
if ( self._visible ) { this.reposition();
DOM.addClass( self.getEl(), 'mce-inline-toolbar-grp-active' ); DOM.addClass( this.getEl(), 'mce-inline-toolbar-grp-active' );
self.reposition();
} }
}, 100 );
} ); } );
floatingToolbar.on( 'hide', function() { floatingToolbar.on( 'hide', function() {

File diff suppressed because one or more lines are too long