Fix DFW resizing after reaching the sanity check width, props merty, fixes #17983 for 3.2
git-svn-id: http://svn.automattic.com/wordpress/branches/3.2@18398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
678400d544
commit
3cf910cbf4
|
@ -246,11 +246,13 @@ PubSub.prototype.publish = function( topic, args ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
w = n + w;
|
||||||
|
|
||||||
if ( w < 200 || w > 1200 ) // sanity check
|
if ( w < 200 || w > 1200 ) // sanity check
|
||||||
return;
|
return;
|
||||||
|
|
||||||
el.width( n + w );
|
el.width( w );
|
||||||
setUserSetting('dfw_width', n + w);
|
setUserSetting('dfw_width', w);
|
||||||
}
|
}
|
||||||
|
|
||||||
ps.subscribe( 'showToolbar', function() {
|
ps.subscribe( 'showToolbar', function() {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -96,7 +96,7 @@ function wp_default_scripts( &$scripts ) {
|
||||||
$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110411' );
|
$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110411' );
|
||||||
$scripts->add_data( 'editor', 'group', 1 );
|
$scripts->add_data( 'editor', 'group', 1 );
|
||||||
|
|
||||||
$scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110610' );
|
$scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110704' );
|
||||||
$scripts->add_data( 'wp-fullscreen', 'group', 1 );
|
$scripts->add_data( 'wp-fullscreen', 'group', 1 );
|
||||||
|
|
||||||
$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6.1');
|
$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6.1');
|
||||||
|
|
Loading…
Reference in New Issue