diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index 6b4d7ed311..d0d0714c48 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -3710,6 +3710,12 @@ table.diff .diff-addedline ins { min-width: 130px; padding: 4px; display: none; + opacity: 0; + -webkit-transition: left 15ms; + -moz-transition: left 15ms; + -ms-transition: left 15ms; + -o-transition: left 15ms; + transition: left 15ms; } .comparing-two-revisions .revisions-tooltip { diff --git a/wp-admin/js/revisions.js b/wp-admin/js/revisions.js index 645a8ea2f5..7484dfc3ae 100644 --- a/wp-admin/js/revisions.js +++ b/wp-admin/js/revisions.js @@ -597,18 +597,11 @@ window.wp = window.wp || {}; }, toggleVisibility: function( options ) { - options = options || {}; - var visible = this.visible(); - if ( visible ) { // Immediate show - this.$el.fadeIn( 200 ); - } else if ( options.immediate ) { // Immediate fade out - this.$el.fadeOut( 200 ); - } else { // Wait a bit, make sure we're really done, then fade it out - _.delay( function( view ) { - if ( ! view.visible() ) - view.toggleVisibility({ immediate: true }); - }, 500, this ); - } + if ( this.visible() ) + this.$el.stop().show().fadeTo( 100 - this.el.style.opacity * 100, 1 ); + else + this.$el.stop().fadeTo( this.el.style.opacity * 300, 0, function(){ $(this).hide(); } ); + return; }, render: function() { @@ -698,13 +691,11 @@ window.wp = window.wp || {}; className: 'wp-slider', events: { - 'mousemove' : 'mouseMove', - 'mouseleave' : 'mouseLeave', - 'mouseenter' : 'mouseEnter' + 'mousemove' : 'mouseMove' }, initialize: function() { - _.bindAll( this, 'start', 'slide', 'stop', 'mouseMove' ); + _.bindAll( this, 'start', 'slide', 'stop', 'mouseMove', 'mouseEnter', 'mouseLeave' ); this.listenTo( this.model, 'update:slider', this.applySliderSettings ); }, @@ -715,6 +706,12 @@ window.wp = window.wp || {}; stop: this.stop }) ); + this.$el.hoverIntent({ + over: this.mouseEnter, + out: this.mouseLeave, + timeout: 800 + }); + this.applySliderSettings(); }, diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 6e44c8d90e..c8ac6c66d5 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -276,7 +276,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 ); - $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider' ), false, 1 ); + $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 ); $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );