diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-02-29 18:15:42 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-02-29 18:36:40 +0100 |
| commit | 09732dace8156a10065e29d9cb0e4007fa079d8f (patch) | |
| tree | 3abf096ac14002bb8d02dfbb7b99639c939dea1e | |
| parent | 72023dd045a7fead5a3136ec2400ad4743a190d2 (diff) | |
| download | jquery-ui-09732dace8156a10065e29d9cb0e4007fa079d8f.tar.gz jquery-ui-09732dace8156a10065e29d9cb0e4007fa079d8f.zip | |
Update QUnit to latest, reverting the bad reset 'patch'
| -rw-r--r-- | external/qunit.css | 2 | ||||
| -rw-r--r-- | external/qunit.js | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/external/qunit.css b/external/qunit.css index 3334e21de..58101ea34 100644 --- a/external/qunit.css +++ b/external/qunit.css @@ -1,5 +1,5 @@ /** - * QUnit v1.3.0 - A JavaScript Unit Testing Framework + * QUnit v1.4.0pre - A JavaScript Unit Testing Framework * * http://docs.jquery.com/QUnit * diff --git a/external/qunit.js b/external/qunit.js index cd5631d86..1d609f61a 100644 --- a/external/qunit.js +++ b/external/qunit.js @@ -1,5 +1,5 @@ /** - * QUnit v1.3.0 - A JavaScript Unit Testing Framework + * QUnit v1.4.0pre - A JavaScript Unit Testing Framework * * http://docs.jquery.com/QUnit * @@ -579,15 +579,15 @@ extend(QUnit, { /** * Resets the test setup. Useful for tests that modify the DOM. * - * If jQuery is available, uses jQuery's replaceWith(), otherwise use replaceChild + * If jQuery is available, uses jQuery's html(), otherwise just innerHTML. */ reset: function() { - var main = id( 'qunit-fixture' ); - if ( main ) { - if ( window.jQuery ) { - jQuery( main ).replaceWith( config.fixture.cloneNode(true) ); - } else { - main.parentNode.replaceChild(config.fixture.cloneNode(true), main); + if ( window.jQuery ) { + jQuery( "#qunit-fixture" ).html( config.fixture ); + } else { + var main = id( 'qunit-fixture' ); + if ( main ) { + main.innerHTML = config.fixture; } } }, @@ -798,7 +798,7 @@ QUnit.load = function() { var main = id('qunit-fixture'); if ( main ) { - config.fixture = main.cloneNode(true); + config.fixture = main.innerHTML; } if (config.autostart) { |