| Index: trunk/phase3/resources/jquery/jquery.qunit.js |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | /** |
| 3 | | - * QUnit 1.2.0pre - A JavaScript Unit Testing Framework |
| | 3 | + * QUnit v1.2.0 - A JavaScript Unit Testing Framework |
| 4 | 4 | * |
| 5 | 5 | * http://docs.jquery.com/QUnit |
| 6 | 6 | * |
| — | — | @@ -1065,6 +1065,10 @@ |
| 1066 | 1066 | } |
| 1067 | 1067 | } |
| 1068 | 1068 | |
| | 1069 | + var getProto = Object.getPrototypeOf || function (obj) { |
| | 1070 | + return obj.__proto__; |
| | 1071 | + }; |
| | 1072 | + |
| 1069 | 1073 | var callbacks = function () { |
| 1070 | 1074 | |
| 1071 | 1075 | // for string, boolean, number and null |
| — | — | @@ -1154,7 +1158,13 @@ |
| 1155 | 1159 | // comparing constructors is more strict than using |
| 1156 | 1160 | // instanceof |
| 1157 | 1161 | if (a.constructor !== b.constructor) { |
| 1158 | | - return false; |
| | 1162 | + // Allow objects with no prototype to be equivalent to |
| | 1163 | + // objects with Object as their constructor. |
| | 1164 | + if (!((getProto(a) === null && getProto(b) === Object.prototype) || |
| | 1165 | + (getProto(b) === null && getProto(a) === Object.prototype))) |
| | 1166 | + { |
| | 1167 | + return false; |
| | 1168 | + } |
| 1159 | 1169 | } |
| 1160 | 1170 | |
| 1161 | 1171 | // stack constructor before traversing properties |
| Index: trunk/phase3/resources/jquery/jquery.qunit.css |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | /** |
| 3 | | - * QUnit 1.2.0pre - A JavaScript Unit Testing Framework |
| | 3 | + * QUnit v1.2.0 - A JavaScript Unit Testing Framework |
| 4 | 4 | * |
| 5 | 5 | * http://docs.jquery.com/QUnit |
| 6 | 6 | * |