Merge pull request #1084 from edx/jmclaus/bugfix_focus_speed_control

Focus speed control

common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js

@@ -138,6 +138,26 @@
           expect(videoSpeedControl.currentSpeed).toEqual(0.75);
         });
       });
+
+      describe('make sure the speed control gets the focus afterwards', function() {
+        var anchor;
+        beforeEach(function() {
+          initialize();
+          anchor= $('.speeds > a').first();
+          videoSpeedControl.setSpeed(1.0);
+          spyOnEvent(anchor, 'focus');
+        });
+
+        it('when the speed is the same', function() {
+          $('li[data-speed="1.0"] a').click();
+          expect('focus').toHaveBeenTriggeredOn(anchor);
+        });
+
+        it('when the speed is not the same', function() {
+          $('li[data-speed="0.75"] a').click();
+          expect('focus').toHaveBeenTriggeredOn(anchor);
+        });
+      });
     });
 
     describe('onSpeedChange', function() {

common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js

@@ -283,6 +283,9 @@ function () {
                 this.videoSpeedControl.currentSpeed
             );
         }
+        // When a speed entry has been selected, we want the speed control to 
+        // regain focus.
+        parentEl.parent().siblings('a').focus();
     }
 
     function reRender(params) {