From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 5 Aug 2015 20:55:25 +0000 (-0700)
Subject: jsduck: Update eg-iframe.html to match MediaWiki environment
X-Git-Tag: 1.31.0-rc.0~10507
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=fc90f55436350475adef16e3cf601e7aa3325a23;p=lhc%2Fweb%2Fwiklou.git

jsduck: Update eg-iframe.html to match MediaWiki environment

* Add 'resources/lib/phpjs-sha1/sha1.js' (follows-up f37cee996)
* Remove 'resources/src/startup.js' (follows-up b00cd0b12)
  This no longer works due to the $VARS placeholder. Either way
  it is redundant because we already define a 'startUp' function
  inside eg-iframe. We don't need anything from startup.js.

Bug: T107925
Change-Id: Iaf75850060556f03ebaa37b8e1dce0de6f1c16ce
---

diff --git a/maintenance/jsduck/eg-iframe.html b/maintenance/jsduck/eg-iframe.html
index fca839d99b..2c42364aa0 100644
--- a/maintenance/jsduck/eg-iframe.html
+++ b/maintenance/jsduck/eg-iframe.html
@@ -33,13 +33,13 @@
 			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/lib/jquery/jquery.js"></script>
+	<script src="modules/lib/phpjs-sha1/sha1.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>
diff --git a/resources/Resources.php b/resources/Resources.php
index 45240a7ebb..060ed5bf65 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -822,7 +822,7 @@ return array(
 
 	'mediawiki' => array(
 		'class' => 'ResourceLoaderRawFileModule',
-		// Keep maintenance/jsduck/eg-iframe.html in sync
+		// Keep in sync with maintenance/jsduck/eg-iframe.html
 		'scripts' => array(
 			'resources/lib/phpjs-sha1/sha1.js',
 			'resources/src/mediawiki/mediawiki.js',