General fixes

Author: wwilsman

dropkick.js

@@ -62,7 +62,7 @@ var
     close: noop,
 
     // Search method; "strict", "partial", or "fuzzy"
-    search: "strict",
+    search: "strict"
   },
 
   // Common Utilities
@@ -90,7 +90,7 @@ var
     },
 
     // Shallow object extend
-    extend: function(obj) {
+    extend: function( obj ) {
       Array.prototype.slice.call( arguments, 1 ).forEach( function( source ) {
         if ( source ) for ( var prop in source ) obj[ prop ] = source[ prop ];
       });
@@ -397,8 +397,10 @@ Dropkick.prototype = {
         option.selected = !option.selected;
 
         if ( _.hasClass( elem, "dk-option-selected" ) ) {
+          elem.setAttribute( "aria-selected", "true" );
           this.selectedOptions.push( elem );
         } else {
+          elem.setAttribute( "aria-selected", "false" );
           index = this.selectedOptions.indexOf( elem );
           this.selectedOptions.splice( index, 1 );
         }
@@ -562,7 +564,7 @@ Dropkick.prototype = {
   },
 
   _delegate: function( event ) {
-    var index, firstIndex, lastIndex,
+    var selection, index, firstIndex, lastIndex,
       target = event.target;
 
     if ( _.hasClass( target, "dk-option-disabled" ) ) {
@@ -571,31 +573,33 @@ Dropkick.prototype = {
 
     if ( !this.multiple ) {
       this[ this.isOpen ? "close" : "open" ]();
-    }
-
-    if ( _.hasClass( target, "dk-option" ) ) {
-      window.getSelection().collapseToStart();
+      if ( _.hasClass( target, "dk-option" ) ) this.select( target );
+    } else {
+      if ( _.hasClass( target, "dk-option" ) ) {
+        selection = window.getSelection();
+        if ( selection.type == "Range" ) selection.collapseToStart();
 
-      if ( event.shiftKey ) {
-        firstIndex = this.options.indexOf( this.selectedOptions[0] );
-        lastIndex = this.options.indexOf( this.selectedOptions[ this.selectedOptions.length - 1 ] );
-        index =  this.options.indexOf( target );
+        if ( event.shiftKey ) {
+          firstIndex = this.options.indexOf( this.selectedOptions[0] );
+          lastIndex = this.options.indexOf( this.selectedOptions[ this.selectedOptions.length - 1 ] );
+          index =  this.options.indexOf( target );
 
-        if ( index > firstIndex && index < lastIndex ) index = firstIndex;
-        if ( index > lastIndex && lastIndex > firstIndex ) lastIndex = firstIndex;
+          if ( index > firstIndex && index < lastIndex ) index = firstIndex;
+          if ( index > lastIndex && lastIndex > firstIndex ) lastIndex = firstIndex;
 
-        this.reset( true );
+          this.reset( true );
 
-        if ( lastIndex > index ) {
-          while ( index < lastIndex + 1 ) this.select( index++ );
+          if ( lastIndex > index ) {
+            while ( index < lastIndex + 1 ) this.select( index++ );
+          } else {
+            while ( index > lastIndex - 1 ) this.select( index-- );
+          }
+        } else if ( event.ctrlKey || event.metaKey ) {
+          this.select( target );
         } else {
-          while ( index > lastIndex - 1 ) this.select( index-- );
+          this.reset( true );
+          this.select( target );
         }
-      } else if ( event.ctrlKey || event.metaKey ) {
-        this.select( target );
-      } else {
-        this.reset( true );
-        this.select( target );
       }
     }
   },
@@ -630,6 +634,7 @@ Dropkick.prototype = {
     switch ( event.keyCode ) {
     case keys.up:
       i = -1;
+      // deliberate fallthrough
     case keys.down:
       event.preventDefault();
       lastSelected = selected[ selected.length - 1 ];
@@ -653,13 +658,15 @@ Dropkick.prototype = {
         this.open();
         break;
       }
+      // deliberate fallthrough
     case keys.tab:
     case keys.enter:
       for ( i = 0; i < options.length; i++ ) {
         if ( _.hasClass( options[ i ], "dk-option-highlight" ) ) {
           this.select( i );
         }
       }
+      // deliberate fallthrough
     case keys.esc:
       if ( this.isOpen ) {
         event.preventDefault();
@@ -801,7 +808,6 @@ Dropkick.build = function( sel, idpre ) {
   optList = _.create( "ul", {
     "class": "dk-select-options",
     "id": idpre + "-listbox",
-    "aria-expanded": "false",
     "role": "listbox"
   });
 
@@ -815,11 +821,14 @@ Dropkick.build = function( sel, idpre ) {
       "tabindex": sel.tabindex || 0,
       "innerHTML": sel.options[ sel.selectedIndex ].text,
       "id": idpre + "-combobox",
+      "aria-live": "assertive",
       "aria-owns": optList.id,
       "role": "combobox"
     }));
+    optList.setAttribute( "aria-expanded", "false" );
   } else {
     ret.elem.setAttribute( "tabindex", sel.getAttribute( "tabindex" ) || "0" );
+    optList.setAttribute( "aria-multiselectable", "true" );
   }
 
   for ( i = sel.children.length; i--; options.unshift( sel.children[ i ] ) );