From d63538555e71eba7ae1f30119a5d04b8d9b8cbce Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Mon, 8 Nov 2010 17:01:12 +0000
Subject: [PATCH] Making comments added in r76283 more clear + added mw.html to
 test suite

---
 resources/mediawiki.util/mediawiki.util.test.js | 12 ++++++++++--
 resources/mediawiki/mediawiki.js                |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js
index 389dc2d224..74b8435a26 100644
--- a/resources/mediawiki.util/mediawiki.util.test.js
+++ b/resources/mediawiki.util/mediawiki.util.test.js
@@ -68,6 +68,8 @@
 							'object (string)');
 						mw.test.addTest('typeof mw.util',
 							'object (string)');
+						mw.test.addTest('typeof mw.html',
+							'object (string)');
 						mw.test.addTest('typeof String.prototype.ucFirst',
 							'function (string)');
 						mw.test.addTest('\'mediawiki\'.ucFirst()',
@@ -88,16 +90,22 @@
 							'function (string)');
 						mw.test.addTest('mw.util.getParamValue( \'action\' )',
 							'mwutiltest (string)');
+						mw.test.addTest('mw.util.getParamValue( \'foo\', \'http://mw.org/?foo=wrong&foo=right#&foo=bad\' )',
+							'right (string)');
 						mw.test.addTest('mw.util.tooltipAccessKeyRegexp.constructor.name',
 							'RegExp (string)');
 						mw.test.addTest('typeof mw.util.updateTooltipAccessKeys',
 							'function (string)');
 						mw.test.addTest('typeof mw.util.addPortletLink',
 							'function (string)');
-						mw.test.addTest('typeof mw.util.addPortletLink("p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print")',
+						mw.test.addTest('typeof mw.util.addPortletLink( "p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print" )',
 							'object (string)');
-						mw.test.addTest('a = mw.util.addPortletLink("p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print"); $(a).text();',
+						mw.test.addTest('a = mw.util.addPortletLink( "p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print" ); $(a).text();',
 							'MediaWiki.org (string)');
+						mw.test.addTest('mw.html.element( \'hr\' )',
+							'<hr/> (string)');
+						mw.test.addTest('mw.html.element( \'img\', { \'src\': \'http://mw.org/?title=Main page&action=edit\' } )',
+							'<img src="http://mw.org/?title=Main page&amp;action=edit"/> (string)');
 
 						// Run tests and compare results
 						var	exec,
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 625cab1dff..d83eac0561 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -968,11 +968,11 @@ window.mediaWiki = new ( function( $ ) {
 				s += ' ' + attrName + '="' + this.escape( attrs[attrName] ) + '"';
 			}
 			if ( typeof contents == 'undefined' || contents === null ) {
-				// Short close tag
+				// Self close tag
 				s += '/>';
 				return s;
 			}
-			// Regular close tag
+			// Regular open tag
 			s += '>';
 			if (typeof contents === 'string') {
 				// Escaped
-- 
2.20.1