Merge "(bug 38024) Skip styles for modules that don't have stylesheets"

[lhc/web/wiklou.git] / resources / mediawiki / mediawiki.debug.js

diff --git a/resources/mediawiki/mediawiki.debug.js b/resources/mediawiki/mediawiki.debug.js
index 641ee12..e631c76 100644 (file)
--- a/resources/mediawiki/mediawiki.debug.js
+++ b/resources/mediawiki/mediawiki.debug.js
@@ -1,5 +1,5 @@
 /**
- * JavaScript for the new debug toolbar, enabled with $wgDebugToolbar
+ * JavaScript for the new debug toolbar, enabled through $wgDebugToolbar.
  *
  * @author John Du Hart
  * @since 1.19
@@ -26,13 +26,15 @@
                data: {},
 
                /**
-                * Initializes the debugging pane
+                * Initializes the debugging pane.
+                * Shouldn't be called before the document is ready
+                * (since it binds to elements on the page).
                 *
-                * @param {Object} data
+                * @param {Object} data, defaults to 'debugInfo' from mw.config
                 */
                init: function ( data ) {
 
-                       this.data = data;
+                       this.data = data || mw.config.get( 'debugInfo' );
                        this.buildHtml();
 
                        // Insert the container into the DOM
@@ -63,6 +65,9 @@
                                }
                        }
 
+                       // Skip hash fragment handling. Prevents screen from jumping.
+                       e.preventDefault();
+
                        $( this ).addClass( 'current ');
                        $( '.mw-debug-panelink' ).not( this ).removeClass( 'current ');
 
@@ -127,10 +132,15 @@
                        /**
                         * Returns a jQuery element for a debug-bit div with a for a pane link
                         *
-                        * @param id
+                        * @param id CSS id snippet. Will be prefixed with 'mw-debug-'
+                        * @param text Text to show
+                        * @param count Optional count to show
                         * @return {jQuery}
                         */
-                       function paneTriggerBitDiv( id, text ) {
+                       function paneTriggerBitDiv( id, text, count ) {
+                               if( count ) {
+                                       text = text + ' (' + count + ')';
+                               }
                                return $( '<div>' ).attr({
                                        id: 'mw-debug-' + id,
                                        'class': 'mw-debug-bit mw-debug-panelink'
@@ -139,19 +149,32 @@
                                .appendTo( $bits );
                        }
 
-                       paneTriggerBitDiv( 'console', 'Console (' + this.data.log.length + ')' );
+                       paneTriggerBitDiv( 'console', 'Console', this.data.log.length );
 
-                       paneTriggerBitDiv( 'querylist', 'Queries: ' + this.data.queries.length );
+                       paneTriggerBitDiv( 'querylist', 'Queries', this.data.queries.length );
 
-                       paneTriggerBitDiv( 'debuglog', 'Debug Log (' + this.data.debugLog.length + ' lines)' );
+                       paneTriggerBitDiv( 'debuglog', 'Debug log', this.data.debugLog.length );
 
                        paneTriggerBitDiv( 'request', 'Request' );
 
-                       paneTriggerBitDiv( 'includes', this.data.includes.length + ' Files Included' );
+                       paneTriggerBitDiv( 'includes', 'PHP includes', this.data.includes.length );
+
+                       var gitInfo = '';
+                       if ( this.data.gitRevision != false ) {
+                               gitInfo = '(' + this.data.gitRevision.substring( 0, 7 ) + ')';
+                               if ( this.data.gitViewUrl != false ) {
+                                       gitInfo = $( '<a></a>' ).attr( 'href', this.data.gitViewUrl ).text( gitInfo );
+                               }
+                       }
 
                        bitDiv( 'mwversion' )
                                .append( $( '<a href="//www.mediawiki.org/"></a>' ).text( 'MediaWiki' ) )
-                               .append( ': ' + this.data.mwVersion );
+                               .append( ': ' + this.data.mwVersion + ' ' )
+                               .append( gitInfo );
+
+                       if ( this.data.gitBranch != false ) {
+                               bitDiv( 'gitbranch' ).text( 'Git branch: ' + this.data.gitBranch );
+                       }
 
                        bitDiv( 'phpversion' )
                                .append( $( '<a href="//www.php.net/"></a>' ).text( 'PHP' ) )
@@ -243,11 +266,12 @@
 
                        $table = $( '<table id="mw-debug-querylist"></table>' );
 
-                       // Widths on table cells and columns behave weird in some browsers like Chrome,
-                       // in that, contrary to the W3 box model, padding does not increase cells having a fixed width
-                       $('<colgroup>').css( 'width', /*padding=*/20 + ( String( this.data.queries.length ).length*/*fontSize*/11 ) ).appendTo( $table );
-                       $('<colgroup>').appendTo( $table );
-                       $('<colgroup>').css( 'width', 350 ).appendTo( $table );
+                       $( '<tr>' )
+                               .append( $('<th>#</th>').css( 'width', '4em' )    )
+                               .append( $('<th>SQL</th>') )
+                               .append( $('<th>Time</th>').css( 'width', '8em'  ) )
+                               .append( $('<th>Call</th>').css( 'width', '18em' ) )
+                       .appendTo( $table );
 
                        for ( i = 0, length = this.data.queries.length; i < length; i += 1 ) {
                                query = this.data.queries[i];
@@ -255,11 +279,9 @@
                                $( '<tr>' )
                                        .append( $( '<td>' ).text( i + 1 ) )
                                        .append( $( '<td>' ).text( query.sql ) )
-                                       .append( $( '<td>' )
-                                               .append( $( '<span class="stats"></span>' ).text( '(' + query.time.toFixed( 4 ) + 'ms) ' ) )
-                                               .append( query['function'] )
-                                       )
-                                       .appendTo( $table );
+                                       .append( $( '<td class="stats">' ).text( ( query.time * 1000 ).toFixed( 4 ) + 'ms' ) )
+                                       .append( $( '<td>' ).text( query['function'] ) )
+                               .appendTo( $table );
                        }