http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90635
Revision: 90635
Author: brion
Date: 2011-06-22 23:47:29 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Followup r90595, r90626: remove async magic from table sorter tests now that
the setTimeout has been removed from the sorting click handler. Keeps things a
little simpler and more reliable. :)
Modified Paths:
--------------
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
Modified:
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
===================================================================
--- trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
2011-06-22 23:38:01 UTC (rev 90634)
+++ trunk/phase3/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
2011-06-22 23:47:29 UTC (rev 90635)
@@ -78,17 +78,11 @@
// Give caller a chance to set up sorting and manipulate the
table.
callback( $table );
-
- // Table sorting is done asynchronously in the event loop by
running
- // it through a setTimeout({},0); we need to do the same so we
can
- // check our results after.
- stop( 1000 ); // timeout in 1s
- setTimeout(function() {
- start(); // continue the async tests...
- var extracted = tableExtract( $table );
- deepEqual( extracted, expected, msg )
- }, 150);
+ // Table sorting is done synchronously; if it ever needs to
change back
+ // to asynchronous, we'll need a timeout or a callback here.
+ var extracted = tableExtract( $table );
+ deepEqual( extracted, expected, msg )
});
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs