<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26277] trunk/src/wp-admin: Widgets:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26277">26277</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-11-20 01:34:41 +0000 (Wed, 20 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Widgets:
- Fix support for expanding (wide) widgets in the Inactive Widgets area.
- Remove resizing of the sidebars height.
- Stop removing unneeded "for" attributes from labels inside the widgets. Was a fix for IE6 odd behaviour.
See <a href="http://core.trac.wordpress.org/ticket/26117">#26117</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminjswidgetsjs">trunk/src/wp-admin/js/widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26276 => 26277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-11-19 23:51:44 UTC (rev 26276)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-11-20 01:34:41 UTC (rev 26277)
</span><span class="lines">@@ -10304,34 +10304,39 @@
</span><span class="cx"> div#widgets-right .sidebar-name h3 {
</span><span class="cx"> padding: 15px 15px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> div#widgets-right .sidebar-name .sidebar-name-arrow:before {
</span><span class="cx"> right: 0;
</span><span class="cx"> top: 4px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> div#widgets-right .widget-top {
</span><span class="cx"> padding: 0;
</span><span class="cx"> background: #f7f7f7;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> div#widgets-right .widget-title-action {
</span><span class="cx"> float: right;
</span><span class="cx"> position: relative;
</span><span class="cx"> top: 14px;
</span><span class="cx"> right: 10px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> div#widgets-right a.widget-action:after {
</span><span class="cx"> content: '\f111';
</span><span class="cx"> color: #888;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> div#widgets-right .widget-inside {
</span><span class="cx"> border-top: 1px solid #dedede;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#widgets-right .widgets-sortables {
</span><del>- min-height: 42px !important; /* Inline styles */
</del><span class="cx"> padding: 0 8px;
</span><span class="cx"> margin-bottom: 8px;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> div#widgets-right .widgets-sortables:before {
</span><span class="cx"> display: block;
</span><span class="cx"> content: "";
</span><span class="lines">@@ -10348,6 +10353,11 @@
</span><span class="cx"> color: #aaa;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.sidebar-name .spinner {
+ margin: -5px 5px;
+ float: none;
+}
+
</ins><span class="cx"> /* Accessibility Mode */
</span><span class="cx"> #available-widgets .widget-control-edit .edit {
</span><span class="cx"> display :none;
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/widgets.js (26276 => 26277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/widgets.js 2013-11-19 23:51:44 UTC (rev 26276)
+++ trunk/src/wp-admin/js/widgets.js 2013-11-20 01:34:41 UTC (rev 26277)
</span><span class="lines">@@ -10,8 +10,7 @@
</span><span class="cx"> chooser = $('#widgets-chooser'),
</span><span class="cx"> selectSidebar = chooser.find('.widgets-chooser-sidebars'),
</span><span class="cx"> sidebars = $('div.widgets-sortables'),
</span><del>- isRTL = !! ( 'undefined' !== typeof isRtl && isRtl ),
- margin = ( isRTL ? 'marginRight' : 'marginLeft' );
</del><ins>+ isRTL = !! ( 'undefined' !== typeof isRtl && isRtl );
</ins><span class="cx">
</span><span class="cx"> $('#widgets-right').children('.widgets-holder-wrap').children('.sidebar-name').click( function() {
</span><span class="cx"> var $this = $(this), parent = $this.parent();
</span><span class="lines">@@ -27,34 +26,30 @@
</span><span class="cx"> $(this).parent().toggleClass('closed');
</span><span class="cx"> });
</span><span class="cx">
</span><del>- sidebars.each(function(){
- if ( $(this).parent().hasClass('inactive') )
- return true;
-
- var h = 50, H = $(this).children('.widget').length;
- h = h + parseInt(H * 48, 10);
- $(this).css( 'minHeight', h + 'px' );
- });
-
</del><span class="cx"> $(document.body).bind('click.widgets-toggle', function(e){
</span><del>- var target = $(e.target), css = {}, widget, inside, w;
</del><ins>+ var target = $(e.target), css = { 'z-index': 100 }, widget, inside, w;
</ins><span class="cx">
</span><span class="cx"> if ( target.parents('.widget-top').length && ! target.parents('#available-widgets').length ) {
</span><span class="cx"> widget = target.closest('div.widget');
</span><span class="cx"> inside = widget.children('.widget-inside');
</span><del>- w = parseInt( widget.find('input.widget-width').val(), 10 );
</del><ins>+ targetWidth = parseInt( widget.find('input.widget-width').val(), 10 ),
+ widgetWidth = widget.width();
</ins><span class="cx">
</span><span class="cx"> if ( inside.is(':hidden') ) {
</span><del>- if ( w > 250 && inside.closest('div.widgets-sortables').length ) {
- if ( inside.closest('div.widget-liquid-right').length )
- css[margin] = 235 - w + 'px';
- widget.css(css);
</del><ins>+ if ( targetWidth > 250 && ( targetWidth + 30 > widgetWidth ) && widget.closest('div.widgets-sortables').length ) {
+ if ( widget.closest('div.widget-liquid-right').length ) {
+ margin = isRTL ? 'margin-right' : 'margin-left';
+ } else {
+ margin = isRTL ? 'margin-left' : 'margin-right';
+ }
+
+ css[ margin ] = widgetWidth - ( targetWidth + 30 ) + 'px';
+ widget.css( css );
</ins><span class="cx"> }
</span><del>- wpWidgets.fixLabels(widget);
</del><span class="cx"> inside.slideDown('fast');
</span><span class="cx"> } else {
</span><span class="cx"> inside.slideUp('fast', function() {
</span><del>- widget.css({'width':'', margin:''});
</del><ins>+ widget.attr( 'style', '' );
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> e.preventDefault();
</span><span class="lines">@@ -104,7 +99,6 @@
</span><span class="cx"> containment: 'document',
</span><span class="cx"> start: function(e,ui) {
</span><span class="cx"> ui.item.children('.widget-inside').hide();
</span><del>- ui.item.css({margin:'', 'width':''});
</del><span class="cx"> },
</span><span class="cx"> stop: function(e,ui) {
</span><span class="cx"> if ( ui.item.hasClass('ui-draggable') && ui.item.data('draggable') )
</span><span class="lines">@@ -121,7 +115,7 @@
</span><span class="cx"> id = the_id,
</span><span class="cx"> sb = $(this).attr('id');
</span><span class="cx">
</span><del>- ui.item.css({margin:'', 'width':''});
</del><ins>+ ui.item.attr( 'style', '' );
</ins><span class="cx"> the_id = '';
</span><span class="cx">
</span><span class="cx"> if ( add ) {
</span><span class="lines">@@ -258,8 +252,6 @@
</span><span class="cx"> $.post( ajaxurl, a, function() {
</span><span class="cx"> $('.spinner').hide();
</span><span class="cx"> });
</span><del>-
- this.resize();
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> save : function(widget, del, animate, order) {
</span><span class="lines">@@ -298,14 +290,12 @@
</span><span class="cx"> });
</span><span class="cx"> } else {
</span><span class="cx"> widget.remove();
</span><del>- wpWidgets.resize();
</del><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> $('.spinner').hide();
</span><span class="cx"> if ( r && r.length > 2 ) {
</span><span class="cx"> $('div.widget-content', widget).html(r);
</span><span class="cx"> wpWidgets.appendTitle(widget);
</span><del>- wpWidgets.fixLabels(widget);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( order )
</span><span class="lines">@@ -324,28 +314,9 @@
</span><span class="cx">
</span><span class="cx"> },
</span><span class="cx">
</span><del>- resize : function() {
- $('div.widgets-sortables').each(function(){
- if ( $(this).parent().hasClass('inactive') )
- return true;
-
- var h = 50, H = $(this).children('.widget').length;
- h = h + parseInt(H * 48, 10);
- $(this).css( 'minHeight', h + 'px' );
- });
- },
-
- fixLabels : function(widget) {
- widget.children('.widget-inside').find('label').each(function(){
- var f = $(this).attr('for');
- if ( f && f === $('input', this).attr('id') )
- $(this).removeAttr('for');
- });
- },
-
</del><span class="cx"> close : function(widget) {
</span><del>- widget.children('.widget-inside').slideUp('fast', function(){
- widget.css({'width':'', margin:''});
</del><ins>+ widget.children('.widget-inside').slideUp('fast', function() {
+ widget.attr( 'style', '' );
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>