* lib/rdoc: Update to RDoc 4.1.0.preview.1

  RDoc 4.1.0 contains a number of enhancements including a new default
  style and accessibility support.  You can see the changelog here:

  https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc

* test/rdoc:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 12 insertions, 19 deletions

diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
index f26fd45d3a..06fef3b215 100644
--- a/lib/rdoc/generator/template/darkfish/js/darkfish.js
+++ b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -52,20 +52,6 @@ function hookDebuggingToggle() {
   $('#debugging-toggle img').click( toggleDebuggingSection );
 };
 
-function hookTableOfContentsToggle() {
-  $('.indexpage li .toc-toggle').each( function() {
-    $(this).click( function() {
-      $(this).toggleClass('open');
-    });
-
-    var section = $(this).next();
-
-    $(this).click( function() {
-      section.slideToggle();
-    });
-  });
-}
-
 function hookSearch() {
   var input  = $('#search-field').eq(0);
   var result = $('#search-results').eq(0);
@@ -149,7 +135,6 @@ $(document).ready( function() {
   hookDebuggingToggle();
   hookSearch();
   highlightLocationTarget();
-  hookTableOfContentsToggle();
 
   $('ul.link-list a').bind( "click", highlightClickTarget );
 });
diff --git a/lib/rdoc/generator/template/darkfish/js/search.js b/lib/rdoc/generator/template/darkfish/js/search.js
index dbdfdcbc4c..563ed7e54e 100644
--- a/lib/rdoc/generator/template/darkfish/js/search.js
+++ b/lib/rdoc/generator/template/darkfish/js/search.js
@@ -39,9 +39,12 @@ Search.prototype = $.extend({}, Navigation, new function() {
     if (value == '') {
       this.lastQuery = value;
       this.$result.empty();
+      this.$result.attr('aria-expanded', 'false');
       this.setNavigationActive(false);
     } else if (value != this.lastQuery) {
       this.lastQuery = value;
+      this.$result.attr('aria-busy',     'true');
+      this.$result.attr('aria-expanded', 'true');
       this.firstRun = true;
       this.searcher.find(value);
     }
@@ -55,23 +58,28 @@ Search.prototype = $.extend({}, Navigation, new function() {
     }
 
     for (var i=0, l = results.length; i < l; i++) {
-      target.appendChild(this.renderItem.call(this, results[i]));
+      var item = this.renderItem.call(this, results[i]);
+      item.setAttribute('id', 'search-result-' + target.childElementCount);
+      target.appendChild(item);
     };
 
     if (this.firstRun && results.length > 0) {
       this.firstRun = false;
       this.$current = $(target.firstChild);
-      this.$current.addClass('current');
+      this.$current.addClass('search-selected');
     }
     if (jQuery.browser.msie) this.$element[0].className += '';
+
+    if (isLast) this.$result.attr('aria-busy', 'false');
   }
 
   this.move = function(isDown) {
     if (!this.$current) return;
     var $next = this.$current[isDown ? 'next' : 'prev']();
     if ($next.length) {
-      this.$current.removeClass('current');
-      $next.addClass('current');
+      this.$current.removeClass('search-selected');
+      $next.addClass('search-selected');
+      this.$input.attr('aria-activedescendant', $next.attr('id'));
       this.scrollIntoView($next[0], this.$view[0]);
       this.$current = $next;
     }