Changeset 306

Timestamp:

01/22/2014 06:34:41 PM (11 years ago)

Author:

nacin

Message:

Trac: More focuses updates. see #287.

Location:

sites/trunk/wordpress.org/public_html/style/trac

Files:

• wp-trac.css (modified) (2 diffs)
• wp-trac.js (modified) (9 diffs)

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css

@@ -1123 +1123 @@
 /* =Focuses */
 #properties table td#focuses {
-    padding: .6em 0 .3em;
+    padding: .6em 0 .3em 100px;
     height: 66px;
 }
@@ -1131 +1131 @@
 #focuses ul {
     float: left;
-    width: 356px;
+    width: 256px;
     margin: 0;
     padding: 0;

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -29 +29 @@
     coreFocusesList = {
         'ui' : 'UI or design related.',
+        'accessibility' : 'Accessibility focus.',
         'javascript' : 'Heavy JavaScript focus.',
-        // '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.',
+        // '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.',
         'performance' : 'Performance or caching (but not the Cache API component).',
-        // 'multisite' : 'Relating to multisite, but assigned a more specific component.'
+        'rtl' : 'Right-to-left languages.'
     };
 
@@ -48 +48 @@
         init: function() {
             wpTrac.hacks();
+            wpTrac.nonGardeners();
             if ( ! $(document.body).hasClass( 'plugins' ) ) {
                 wpTrac.workflow.init();
-            }
-            wpTrac.nonGardeners();
+                if ( $(document.body).hasClass( 'core' ) ) {
+                    // wpTrac.focuses.init();
+                }
+            }
         },
 
@@ -147 +150 @@
                 window.onbeforeunload = function() {
                     if ( window.location.pathname === '/newticket' ) {
-                        if ( 0 === $( '#field-description' ).val().length && 0 === $( '#field-summary' ).val().length ) {
+                        if ( ! $( '#field-description' ).val() && ! $( '#field-summary' ).val() ) {
                             return;
                         }
-                    } else if ( 0 === $( '#comment' ).val().length ) {
+                    } else if ( ! $( '#comment' ).val() ) {
                         return;
+                    
                     }
                     return 'The changes you made will be lost if you navigate away from this page.';
@@ -256 +260 @@
             if ( $('#field-owner').length ) {
                 $('#field-priority, #field-severity, #field-milestone, #field-cc, #field-keywords').parents('td').hide().prev().hide();
+                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' ) );
+                }
             }
 
@@ -527 +535 @@
                 }
                 $('label[for="field-focuses"]').parent().remove();
-                field.parent().attr({ colspan: 2, id: 'focuses' });
+                if ( field.parent().attr( 'colspan' ) == 3 ) {
+                    field.parent().attr( 'id', 'focuses' );
+                } else {
+                    field.parent().attr({ colspan: 2, id: 'focuses' });
+                }
                 field.hide();
 
@@ -556 +568 @@
                 container.on( 'click', 'a', addRemove );
                 container.closest( 'form' ).on( 'submit', submit );
+                $( '#field-component' ).on( 'change', componentSync );
             }
 
@@ -569 +582 @@
 
             function add( focus ) {
+                if ( typeof focus === 'string' ) {
+                    focus = container.find( 'li.' + focus );
+                }
                 focus.addClass( 'active' );
                 focuses.push( focus.data( 'focus' ) );
@@ -575 +591 @@
 
             function remove( focus ) {
+                if ( typeof focus === 'string' ) {
+                    focus = container.find( 'li.' + focus );
+                }
                 focus.removeClass( 'active' );
                 var remove = focus.data( 'focus' );
@@ -591 +610 @@
                 }); 
                 field.val( orderedFocuses.join( ', ' ) );
+            }
+
+            function componentSync() {
+                var component = $(this).val();
+                if ( component === 'Network Admin' || component === 'Networks/Sites' ) {
+                    add( 'multisite' );
+                }
             }