<!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>[306] sites/trunk/wordpress.org/public_html/style/trac: Trac: More focuses updates.</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://meta.trac.wordpress.org/changeset/306">306</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-22 18:34:41 +0000 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trac: More focuses updates. see <a href="http://meta.trac.wordpress.org/ticket/287">#287</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletracwptraccss">sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletracwptracjs">sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlstyletracwptraccss"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css (305 => 306)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css 2014-01-22 16:54:56 UTC (rev 305)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css 2014-01-22 18:34:41 UTC (rev 306)
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx">
</span><span class="cx"> /* =Focuses */
</span><span class="cx"> #properties table td#focuses {
</span><del>- padding: .6em 0 .3em;
</del><ins>+ padding: .6em 0 .3em 100px;
</ins><span class="cx"> height: 66px;
</span><span class="cx"> }
</span><span class="cx"> #focuses span {
</span><span class="lines">@@ -1130,7 +1130,7 @@
</span><span class="cx"> }
</span><span class="cx"> #focuses ul {
</span><span class="cx"> float: left;
</span><del>- width: 356px;
</del><ins>+ width: 256px;
</ins><span class="cx"> margin: 0;
</span><span class="cx"> padding: 0;
</span><span class="cx"> list-style: none;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlstyletracwptracjs"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js (305 => 306)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2014-01-22 16:54:56 UTC (rev 305)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2014-01-22 18:34:41 UTC (rev 306)
</span><span class="lines">@@ -28,15 +28,15 @@
</span><span class="cx">
</span><span class="cx"> coreFocusesList = {
</span><span class="cx"> 'ui' : 'UI or design related.',
</span><ins>+ 'accessibility' : 'Accessibility focus.',
</ins><span class="cx"> 'javascript' : 'Heavy JavaScript focus.',
</span><del>- // 'accessibility' : 'Accessibility focus.',
- 'unit tests' : 'PHP or JS unit tests.',
- 'docs' : 'Documentation focus.',
- 'rtl' : 'Right-to-left languages.',
- 'administration' : 'Dashboard related, but assigned a more specifc component.',
- 'template' : 'Relating to theme template functions, but assigned a more specific component.',
</del><ins>+ // 'unit tests' : 'PHP or JS unit tests.',
+ // 'administration' : 'Dashboard related, but assigned a more specifc component.',
+ // 'template' : 'Relating to theme template functions, but assigned a more specific component.',
+ 'docs' : 'Inline documentation focus.',
+ 'multisite' : 'Relating to multisite, but assigned a more specific component.',
</ins><span class="cx"> 'performance' : 'Performance or caching (but not the Cache API component).',
</span><del>- // 'multisite' : 'Relating to multisite, but assigned a more specific component.'
</del><ins>+ 'rtl' : 'Right-to-left languages.'
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> gardenerKeywordList = [ 'commit', 'early', 'i18n-change' ];
</span><span class="lines">@@ -47,10 +47,13 @@
</span><span class="cx">
</span><span class="cx"> init: function() {
</span><span class="cx"> wpTrac.hacks();
</span><ins>+ wpTrac.nonGardeners();
</ins><span class="cx"> if ( ! $(document.body).hasClass( 'plugins' ) ) {
</span><span class="cx"> wpTrac.workflow.init();
</span><ins>+ if ( $(document.body).hasClass( 'core' ) ) {
+ // wpTrac.focuses.init();
+ }
</ins><span class="cx"> }
</span><del>- wpTrac.nonGardeners();
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // These ticket hacks need to be re-run after ticket previews.
</span><span class="lines">@@ -146,11 +149,12 @@
</span><span class="cx"> // Rudimentary save alerts for new tickets (summary/description) and comments.
</span><span class="cx"> window.onbeforeunload = function() {
</span><span class="cx"> if ( window.location.pathname === '/newticket' ) {
</span><del>- if ( 0 === $( '#field-description' ).val().length && 0 === $( '#field-summary' ).val().length ) {
</del><ins>+ if ( ! $( '#field-description' ).val() && ! $( '#field-summary' ).val() ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- } else if ( 0 === $( '#comment' ).val().length ) {
</del><ins>+ } else if ( ! $( '#comment' ).val() ) {
</ins><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> return 'The changes you made will be lost if you navigate away from this page.';
</span><span class="cx"> };
</span><span class="lines">@@ -255,6 +259,10 @@
</span><span class="cx"> // If we're on /newticket (based on the field-owner check), declutter.
</span><span class="cx"> if ( $('#field-owner').length ) {
</span><span class="cx"> $('#field-priority, #field-severity, #field-milestone, #field-cc, #field-keywords').parents('td').hide().prev().hide();
</span><ins>+ if ( $('#field-focuses').length ) {
+ $('#field-focuses').closest('td').attr( 'colspan', 3 );
+ $('#field-component').parent().add( $('#field-component').parent().prev() ).wrapAll( '<tr />' ).insertBefore( $( '#field-focuses' ).parents( 'tr' ) );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> elements.type = $('#field-type');
</span><span class="lines">@@ -526,7 +534,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> $('label[for="field-focuses"]').parent().remove();
</span><del>- field.parent().attr({ colspan: 2, id: 'focuses' });
</del><ins>+ if ( field.parent().attr( 'colspan' ) == 3 ) {
+ field.parent().attr( 'id', 'focuses' );
+ } else {
+ field.parent().attr({ colspan: 2, id: 'focuses' });
+ }
</ins><span class="cx"> field.hide();
</span><span class="cx">
</span><span class="cx"> focuses = $.trim( field.val().replace(/,/g, ' ').replace(/ +/g, ' ') );
</span><span class="lines">@@ -555,6 +567,7 @@
</span><span class="cx">
</span><span class="cx"> container.on( 'click', 'a', addRemove );
</span><span class="cx"> container.closest( 'form' ).on( 'submit', submit );
</span><ins>+ $( '#field-component' ).on( 'change', componentSync );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function addRemove() {
</span><span class="lines">@@ -568,12 +581,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add( focus ) {
</span><ins>+ if ( typeof focus === 'string' ) {
+ focus = container.find( 'li.' + focus );
+ }
</ins><span class="cx"> focus.addClass( 'active' );
</span><span class="cx"> focuses.push( focus.data( 'focus' ) );
</span><span class="cx"> updateField();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function remove( focus ) {
</span><ins>+ if ( typeof focus === 'string' ) {
+ focus = container.find( 'li.' + focus );
+ }
</ins><span class="cx"> focus.removeClass( 'active' );
</span><span class="cx"> var remove = focus.data( 'focus' );
</span><span class="cx"> focuses = $.grep( focuses, function( value ) {
</span><span class="lines">@@ -592,6 +611,13 @@
</span><span class="cx"> field.val( orderedFocuses.join( ', ' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function componentSync() {
+ var component = $(this).val();
+ if ( component === 'Network Admin' || component === 'Networks/Sites' ) {
+ add( 'multisite' );
+ }
+ }
+
</ins><span class="cx"> function submit() {
</span><span class="cx"> if ( focuses.length !== originalFocuses.length )
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>