jenkins-bot has submitted this change and it was merged. Change subject: jsduck: Update references to renamed resources/ directories ......................................................................
jsduck: Update references to renamed resources/ directories The inline examples in the generated documentation due to a 404 Not Found for the javascript files. 1. Run $ ./maintenance/mwjsduck-gen 2. View http://localhost/w/docs/js/#!/api/mw.Map 3. Try "Live Preview" Change-Id: Ic44f029c789042d82ec14e35d385f9ccc59959aa --- M includes/specials/SpecialJavaScriptTest.php M maintenance/jsduck/eg-iframe.html 2 files changed, 4 insertions(+), 5 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index fa719eb..492105d 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -192,7 +192,6 @@ */ private function exportQUnit() { $out = $this->getOutput(); - $out->disable(); $rl = $out->getResourceLoader(); diff --git a/maintenance/jsduck/eg-iframe.html b/maintenance/jsduck/eg-iframe.html index 7dc4afa..0792c24 100644 --- a/maintenance/jsduck/eg-iframe.html +++ b/maintenance/jsduck/eg-iframe.html @@ -3,14 +3,14 @@ <head> <meta charset="utf-8"> <title>MediaWiki Code Example</title> - <script src="modules/startup.js"></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> <style> .mw-jsduck-log { position: relative; @@ -78,7 +78,7 @@ eval( code ); callback && callback( true ); } catch ( e ) { - mw.log( 'Uncaught exception: ' + e ); + mw.log( 'Uncaught ' + e ); callback && callback( false, e ); throw e; } -- To view, visit https://gerrit.wikimedia.org/r/184558 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic44f029c789042d82ec14e35d385f9ccc59959aa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Parent5446 <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
