dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: f3f3452)
Merge "jsduck: Update references to renamed resources/ directories"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Jan 2015 19:25:17 +0000 (19:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Jan 2015 19:25:17 +0000 (19:25 +0000)
includes/specials/SpecialJavaScriptTest.php patch | blob | history
maintenance/jsduck/eg-iframe.html patch | blob | history

diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php
index fa719eb..492105d 100644 (file)
--- a/includes/specials/SpecialJavaScriptTest.php
+++ b/includes/specials/SpecialJavaScriptTest.php
@@ -192,7 +192,6 @@ HTML;
         */
        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 (file)
--- 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;
                }
Wiklou, le Wiki du Wiklou