aboutsummaryrefslogtreecommitdiffstats
path: root/external
diff options
context:
space:
mode:
authorjzaefferer <joern.zaefferer@gmail.com>2010-03-25 16:17:52 -0400
committerjzaefferer <joern.zaefferer@gmail.com>2010-03-25 16:17:52 -0400
commit04115422b53e30caf76a923234d69c0122b0dcb6 (patch)
tree4c6d860a404500b114d36c5ae52122ab2e6d0186 /external
parent0752719de17d02556cc28359ac1adf451e773a74 (diff)
downloadjquery-ui-04115422b53e30caf76a923234d69c0122b0dcb6.tar.gz
jquery-ui-04115422b53e30caf76a923234d69c0122b0dcb6.zip
Updating to latest QUnit
Diffstat (limited to 'external')
-rw-r--r--external/qunit.js46
1 files changed, 37 insertions, 9 deletions
diff --git a/external/qunit.js b/external/qunit.js
index f2704148e..41e6c82f5 100644
--- a/external/qunit.js
+++ b/external/qunit.js
@@ -18,6 +18,7 @@ var QUnit = {
stats: { all: 0, bad: 0 },
moduleStats: { all: 0, bad: 0 },
started: +new Date,
+ updateRate: 1000,
blocking: false,
autorun: false,
assertions: [],
@@ -590,8 +591,16 @@ function synchronize( callback ) {
}
function process() {
+ var start = (new Date()).getTime();
+
while ( config.queue.length && !config.blocking ) {
- config.queue.shift()();
+ if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) {
+ config.queue.shift()();
+
+ } else {
+ setTimeout( process, 13 );
+ break;
+ }
}
}
@@ -679,6 +688,7 @@ QUnit.equiv = function () {
var innerEquiv; // the real equiv function
var callers = []; // stack to decide between skip/abort functions
+ var parents = []; // stack to avoiding loops from circular referencing
// Determine what is o.
@@ -788,28 +798,39 @@ QUnit.equiv = function () {
},
"array": function (b, a) {
- var i;
+ var i, j, loop;
var len;
// b could be an object literal here
if ( ! (hoozit(b) === "array")) {
return false;
- }
-
+ }
+
len = a.length;
if (len !== b.length) { // safe and faster
return false;
}
+
+ //track reference to avoid circular references
+ parents.push(a);
for (i = 0; i < len; i++) {
- if ( ! innerEquiv(a[i], b[i])) {
+ loop = false;
+ for(j=0;j<parents.length;j++){
+ if(parents[j] === a[i]){
+ loop = true;//dont rewalk array
+ }
+ }
+ if (!loop && ! innerEquiv(a[i], b[i])) {
+ parents.pop();
return false;
}
}
+ parents.pop();
return true;
},
"object": function (b, a) {
- var i;
+ var i, j, loop;
var eq = true; // unless we can proove it
var aProperties = [], bProperties = []; // collection of strings
@@ -820,18 +841,25 @@ QUnit.equiv = function () {
// stack constructor before traversing properties
callers.push(a.constructor);
-
+ //track reference to avoid circular references
+ parents.push(a);
+
for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
-
+ loop = false;
+ for(j=0;j<parents.length;j++){
+ if(parents[j] === a[i])
+ loop = true; //don't go down the same path twice
+ }
aProperties.push(i); // collect a's properties
- if ( ! innerEquiv(a[i], b[i])) {
+ if (!loop && ! innerEquiv(a[i], b[i])) {
eq = false;
break;
}
}
callers.pop(); // unstack, we are done
+ parents.pop();
for (i in b) {
bProperties.push(i); // collect b's properties