diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-21 09:39:19 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-21 09:39:19 +0000 |
| commit | f5faa91d3d6ed21a2849f090c40082f95e7dc121 (patch) | |
| tree | 9b180ee4335c67c5930b4d644054099eda76f91d /test | |
| parent | 517acfdd56af4562d3c4f2963f656f2834ca23e2 (diff) | |
| download | scala-f5faa91d3d6ed21a2849f090c40082f95e7dc121.tar.gz scala-f5faa91d3d6ed21a2849f090c40082f95e7dc121.tar.bz2 scala-f5faa91d3d6ed21a2849f090c40082f95e7dc121.zip | |
Merged revisions 24795-24796,24798-24800 via sv...
Merged revisions 24795-24796,24798-24800 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r24795 | kzys | 2011-04-20 16:37:39 +0200 (Wed, 20 Apr 2011) | 2 lines
[scaladoc] kindFilter should switch show/hide anchor of package.
Closes #4463. Review by malayeri. ........ r24796 | extempore |
2011-04-20 18:28:01 +0200 (Wed, 20 Apr 2011) | 1 line
Some tweaks to slice to make it run faster, no review. ........ r24798
| extempore | 2011-04-20 22:43:37 +0200 (Wed, 20 Apr 2011) | 6 lines
One of the blips in the performance charts seems to implicate some
changes I made with slice to reduce the number of implementations and
surface area for inconsistencies and bugs. Altering those changes in
a more performance-mindful way, although I don't see anything here
which is likely to help much. Also fixing some wrong documentation
about copyToArray. No review. ........ r24799 | extempore | 2011-04-21
07:00:54 +0200 (Thu, 21 Apr 2011) | 6 lines
There is still all kinds of code in the pattern matcher which I've
been dragging forward (for years now) unclear on the need for it but
having been burned too many times by its undocumented ways. Returned to
the fray once again and encountered shocking success levels with the
abatement stick. Dumped all kinds of unnecessary code (or so we can
hope) and seem close to fixing some fundamental issues. But we've heard
that before. No review. ........ r24800 | odersky | 2011-04-21 11:31:18
+0200 (Thu, 21 Apr 2011) | 1 line
Made FreshRunReq a traceable exception, so that we can better spot
problems in the IDE. ........
Diffstat (limited to 'test')
| -rw-r--r-- | test/scaladoc/javascript/package.html | 1 | ||||
| -rw-r--r-- | test/scaladoc/javascript/test-index.html | 35 | ||||
| -rw-r--r-- | test/scaladoc/javascript/test-index.js | 17 |
3 files changed, 53 insertions, 0 deletions
diff --git a/test/scaladoc/javascript/package.html b/test/scaladoc/javascript/package.html new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/test/scaladoc/javascript/package.html @@ -0,0 +1 @@ +dummy diff --git a/test/scaladoc/javascript/test-index.html b/test/scaladoc/javascript/test-index.html new file mode 100644 index 0000000000..42cbc8cc09 --- /dev/null +++ b/test/scaladoc/javascript/test-index.html @@ -0,0 +1,35 @@ +<html> + <head> + <link rel="stylesheet" type="text/css" media="screen" + href="http://code.jquery.com/qunit/git/qunit.css" /> + <script type="text/javascript" + src="http://code.jquery.com/qunit/git/qunit.js"></script> + <script type="text/javascript" + src="../../../src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.js"></script> + <script src="../../../src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js"></script> + <script src="../../../src/compiler/scala/tools/nsc/doc/html/resource/lib/scheduler.js"></script> + <script type="text/javascript" + src="../../../src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js"></script> + </head> + <body> + <h1 id="qunit-header">QUnit example</h1> + <h2 id="qunit-banner"></h2> + <div id="qunit-testrunner-toolbar"></div> + <h2 id="qunit-userAgent"></h2> + <ol id="qunit-tests"></ol> + <div id="qunit-fixture"></div> + <div id="browser" class="ui-layout-west"> + <div class="ui-west-center"> + <div id="tpl"> + <ol class="templates"> + <li>template</li> + </ol> + </div> + </div> + </div> + <div id="content" class="ui-layout-center"> + <iframe name="template"></iframe> + </div> + <script type="text/javascript" src="test-index.js"></script> + </body> +</html> diff --git a/test/scaladoc/javascript/test-index.js b/test/scaladoc/javascript/test-index.js new file mode 100644 index 0000000000..121366c931 --- /dev/null +++ b/test/scaladoc/javascript/test-index.js @@ -0,0 +1,17 @@ +Index.PACKAGES = { pkg1: [ { 'class': 'pkg1/Foo.html', name: 'pkg1.Foo' } ] }; + +asyncTest('Trac #4463 - kindFilter', function () { + setTimeout(function () { + start(); + + equal($('#tpl ol.templates:visible').size(), 1); + + kindFilter('packs'); + equal($('#tpl ol.templates:visible').size(), 0); + equal($('#tpl li.pack a.packhide').text(), 'show'); + + kindFilter('all'); + equal($('#tpl ol.templates:visible').size(), 1); + equal($('#tpl li.pack a.packhide').text(), 'hide'); + }, 1000); +}); |