diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /maintenance/jsduck/eg-iframe.html | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'maintenance/jsduck/eg-iframe.html')
-rw-r--r-- | maintenance/jsduck/eg-iframe.html | 71 |
1 files changed, 43 insertions, 28 deletions
diff --git a/maintenance/jsduck/eg-iframe.html b/maintenance/jsduck/eg-iframe.html index 7dc4afa8..fca839d9 100644 --- a/maintenance/jsduck/eg-iframe.html +++ b/maintenance/jsduck/eg-iframe.html @@ -3,14 +3,46 @@ <head> <meta charset="utf-8"> <title>MediaWiki Code Example</title> - <script src="modules/startup.js"></script> + <script> + /** + * Basic log console for the example iframe in documentation pages. + */ + var log = ( function () { + var pre; + return function () { + var str, i, len, line; + if ( !pre ) { + pre = document.createElement( 'pre' ); + pre.className = 'mw-jsduck-log'; + ( document.body || document.documentElement ).appendChild( pre ); + } + str = []; + for ( i = 0, len = arguments.length; i < len; i++ ) { + str.push( String( arguments[ i ] ) ); + } + line = document.createElement( 'div' ); + line.className = 'mw-jsduck-log-line'; + line.appendChild( + document.createTextNode( str.join( ' , ' ) + '\n' ) + ); + pre.appendChild( line ); + }; + }() ); + + window.onerror = function ( error, filePath, linerNr ) { + log( error + '\n' + filePath + ':' + linerNr ); + }; + </script> + <script src="modules/src/startup.js"></script> <script> function startUp() { mw.config = new mw.Map(); } </script> - <script src="modules/jquery/jquery.js"></script> - <script src="modules/mediawiki/mediawiki.js"></script> + <script src="modules/lib/jquery/jquery.js"></script> + <script src="modules/src/mediawiki/mediawiki.js"></script> + <script src="modules/src/mediawiki/mediawiki.errorLogger.js"></script> + <script src="modules/src/mediawiki/mediawiki.startUp.js"></script> <style> .mw-jsduck-log { position: relative; @@ -45,30 +77,13 @@ </head> <body> <script> - /** - * Basic log console for the example iframe in documentation pages. - */ - ( function () { - var pre; - mw.log = function () { - var str, i, len, line; - if ( !pre ) { - pre = document.createElement( 'pre' ); - pre.className = 'mw-jsduck-log'; - document.body.appendChild( pre ); - } - str = []; - for ( i = 0, len = arguments.length; i < len; i++ ) { - str.push( String( arguments[ i ] ) ); - } - line = document.createElement( 'div' ); - line.className = 'mw-jsduck-log-line'; - line.appendChild( - document.createTextNode( str.join( ' , ' ) + '\n' ) - ); - pre.appendChild( line ); - }; - }() ); + if ( window.mw ) { + mw.log = log; + } + + window.onerror = function ( error, filePath, linerNr ) { + log( filePath + ':' + linerNr ); + }; /** * Method called by jsduck to execute the example code. @@ -78,7 +93,7 @@ eval( code ); callback && callback( true ); } catch ( e ) { - mw.log( 'Uncaught exception: ' + e ); + log( 'Uncaught ' + e ); callback && callback( false, e ); throw e; } |