From fc80322774706772d5de9be4a0b24d1bfbb85389 Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Fri, 26 Aug 2011 17:11:31 +0000
Subject: [PATCH] Updating jquery.qunit from upstream * Source:
 https://github.com/jquery/qunit/tree/7f292170fa1109f1355f3e96f8973c32fc553946
 * qunit.css unchanged * In the mean time the pull request I sent has been
 merged in as well (
 https://github.com/jquery/qunit/commit/d2978f4afc75da784c6145fc74c051858ef3c39b
 ), so we can extend the checkbox-toggles with (for example) the
 completenesstest.

---
 resources/jquery/jquery.qunit.js | 34 ++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/resources/jquery/jquery.qunit.js b/resources/jquery/jquery.qunit.js
index 5951e76b5b..a711c82a86 100644
--- a/resources/jquery/jquery.qunit.js
+++ b/resources/jquery/jquery.qunit.js
@@ -453,8 +453,7 @@ var config = {
 	// by default, modify document.title when suite is done
 	altertitle: true,
 
-	noglobals: false,
-	notrycatch: false
+	urlConfig: ['noglobals', 'notrycatch']
 };
 
 // Load paramaters
@@ -472,9 +471,6 @@ var config = {
 			// allow just a key to turn on a flag, e.g., test.html?noglobals
 			current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true;
 			urlParams[ current[ 0 ] ] = current[ 1 ];
-			if ( current[ 0 ] in config ) {
-				config[ current[ 0 ] ] = current[ 1 ];
-			}
 		}
 	}
 
@@ -694,15 +690,19 @@ QUnit.load = function() {
 
 	config.blocking = false;
 
+	var urlConfigHtml = '', len = config.urlConfig.length;
+	for ( var i = 0, val; i < len, val = config.urlConfig[i]; i++ ) {
+		config[val] = QUnit.urlParams[val];
+		urlConfigHtml += '<label><input name="' + val + '" type="checkbox"' + ( config[val] ? ' checked="checked"' : '' ) + '>' + val + '</label>';
+	}
+
 	var userAgent = id("qunit-userAgent");
 	if ( userAgent ) {
 		userAgent.innerHTML = navigator.userAgent;
 	}
 	var banner = id("qunit-header");
 	if ( banner ) {
-		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' +
-			'<label><input name="noglobals" type="checkbox"' + ( config.noglobals ? ' checked="checked"' : '' ) + '>noglobals</label>' +
-			'<label><input name="notrycatch" type="checkbox"' + ( config.notrycatch ? ' checked="checked"' : '' ) + '>notrycatch</label>';
+		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' + urlConfigHtml;
 		addEvent( banner, "change", function( event ) {
 			var params = {};
 			params[ event.target.name ] = event.target.checked ? true : undefined;
@@ -847,6 +847,10 @@ function sourceFromStacktrace() {
 		} else if (e.stack) {
 			// Firefox, Chrome
 			return e.stack.split("\n")[4];
+		} else if (e.sourceURL) {
+			// Safari, PhantomJS
+			// TODO sourceURL points at the 'throw new Error' line above, useless
+			//return e.sourceURL + ":" + e.line;
 		}
 	}
 }
@@ -1198,10 +1202,10 @@ QUnit.jsDump = (function() {
 			if (type == 'function')  {
 					stack.push(obj);
 					var res = parser.call( this, obj, stack );
-					stack.pop();                    
+					stack.pop();
 					return res;
-			} 
-			// else 
+			}
+			// else
 			return (type == 'string') ? parser : this.parsers.error;
 		},
 		typeOf:function( obj ) {
@@ -1382,13 +1386,13 @@ function inArray( elem, array ) {
  */
 QUnit.diff = (function() {
 	function diff(o, n) {
-		var ns = new Object();
-		var os = new Object();
+		var ns = {};
+		var os = {};
 
 		for (var i = 0; i < n.length; i++) {
 			if (ns[n[i]] == null)
 				ns[n[i]] = {
-					rows: new Array(),
+					rows: [],
 					o: null
 				};
 			ns[n[i]].rows.push(i);
@@ -1397,7 +1401,7 @@ QUnit.diff = (function() {
 		for (var i = 0; i < o.length; i++) {
 			if (os[o[i]] == null)
 				os[o[i]] = {
-					rows: new Array(),
+					rows: [],
 					n: null
 				};
 			os[o[i]].rows.push(i);
-- 
2.20.1