/**
- * 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
( function ( $, mw, undefined ) {
"use strict";
+ var hovzer = $.getFootHovzer();
+
var debug = mw.Debug = {
/**
* Toolbar container element
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
- $( 'body' ).append( this.$container );
+ hovzer.$.append( this.$container );
+ hovzer.update();
$( '.mw-debug-panelink' ).click( this.switchPane );
},
var currentPaneId = debug.$container.data( 'currentPane' ),
requestedPaneId = $(this).prop( 'id' ).substr( 9 ),
$currentPane = $( '#mw-debug-pane-' + currentPaneId ),
- $requestedPane = $( '#mw-debug-pane-' + requestedPaneId );
+ $requestedPane = $( '#mw-debug-pane-' + requestedPaneId ),
+ hovDone = false;
- $( this ).addClass( 'current ')
- $( '.mw-debug-panelink' ).not( this ).removeClass( 'current ');
+ function updateHov() {
+ if ( !hovDone ) {
+ hovzer.update();
+ hovDone = true;
+ }
+ }
+ // Skip hash fragment handling. Prevents screen from jumping.
+ e.preventDefault();
+
+ $( this ).addClass( 'current ');
+ $( '.mw-debug-panelink' ).not( this ).removeClass( 'current ');
// Hide the current pane
if ( requestedPaneId === currentPaneId ) {
- $currentPane.slideUp();
+ $currentPane.slideUp( updateHov );
debug.$container.data( 'currentPane', null );
return;
}
debug.$container.data( 'currentPane', requestedPaneId );
if ( currentPaneId === undefined || currentPaneId === null ) {
- $requestedPane.slideDown();
+ $requestedPane.slideDown( updateHov );
} else {
$currentPane.hide();
$requestedPane.show();
+ updateHov();
}
},
buildHtml: function () {
var $container, $bits, panes, id;
- $container = $( '<div id="mw-debug-container" class="mw-debug"></div>' );
+ $container = $( '<div id="mw-debug-toolbar" class="mw-debug"></div>' );
$bits = $( '<div class="mw-debug-bits"></div>' );
/**
* 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'
.appendTo( $bits );
}
- paneTriggerBitDiv( 'querylist', 'Queries: ' + this.data.queries.length );
+ paneTriggerBitDiv( 'console', 'Console', this.data.log.length );
- paneTriggerBitDiv( 'debuglog', 'Debug Log (' + this.data.debugLog.length + ' lines)' );
+ paneTriggerBitDiv( 'querylist', 'Queries', this.data.queries.length );
+
+ 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 ) + ')';
+ }
bitDiv( 'mwversion' )
.append( $( '<a href="//www.mediawiki.org/"></a>' ).text( 'MediaWiki' ) )
- .append( ': ' + this.data.mwVersion );
+ .append( ': ' + this.data.mwVersion + 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' ) )
$bits.appendTo( $container );
panes = {
+ console: this.buildConsoleTable(),
querylist: this.buildQueryTable(),
debuglog: this.buildDebugLogTable(),
request: this.buildRequestPane(),
this.$container = $container;
},
+ /**
+ * Builds the console panel
+ */
+ buildConsoleTable: function () {
+ var $table, entryTypeText, i, length, entry;
+
+ $table = $( '<table id="mw-debug-console">' );
+
+ $('<colgroup>').css( 'width', /*padding=*/20 + ( 10*/*fontSize*/11 ) ).appendTo( $table );
+ $('<colgroup>').appendTo( $table );
+ $('<colgroup>').css( 'width', 350 ).appendTo( $table );
+
+
+ entryTypeText = function( entryType ) {
+ switch ( entryType ) {
+ case 'log':
+ return 'Log';
+ case 'warn':
+ return 'Warning';
+ case 'deprecated':
+ return 'Deprecated';
+ default:
+ return 'Unknown';
+ }
+ };
+
+ for ( i = 0, length = this.data.log.length; i < length; i += 1 ) {
+ entry = this.data.log[i];
+ entry.typeText = entryTypeText( entry.type );
+
+ $( '<tr>' )
+ .append( $( '<td>' )
+ .text( entry.typeText )
+ .attr( 'class', 'mw-debug-console-' + entry.type )
+ )
+ .append( $( '<td>' ).html( entry.msg ) )
+ .append( $( '<td>' ).text( entry.caller ) )
+ .appendTo( $table );
+ }
+
+ return $table;
+ },
+
/**
* Query list pane
*/
$table = $( '<table id="mw-debug-querylist"></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];
$( '<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 );
}
+
return $table;
},
dépôts / lhc / web / wiklou.git / blobdiff