wait #7549 @0.5

diff --git a/_index.html b/_index.html
index c060fc29a5cc62dd1193ae9312dd78e0c2dfdd0d..05e0f54c993f39d95a7f64a2358e2f9b32a2d94c 100644 (file)
--- a/_index.html
+++ b/_index.html
@@ -57,7 +57,7 @@
         <nav id="horizontalNav" role="navigation"></nav>
         <nav id="menu" aria-hidden="true"></nav>
         <div id="search"></div>
-        <a id="logo" aria-hidden="true" tabindex="-1"></a>
+        <a id="logo" aria-hidden="true"></a>
     </header>
     <nav role="navigation" id="interface"></nav>
     <div id="helpView"></div>

diff --git a/js/libs/fluidbook/fluidbook.keyboard.js b/js/libs/fluidbook/fluidbook.keyboard.js
index f47bdf024da9a20c1ad3b13a163f5898fe5a384c..951ac374fbc06fa302e94c9d93951d83fab5bd9f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.keyboard.js
+++ b/js/libs/fluidbook/fluidbook.keyboard.js
@@ -91,17 +91,22 @@ FluidbookKeyboard.prototype = {
     },
 
     tabNavigation: function (selector, dir) {
-        var focusableElementsString = 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex="0"]:not(.ps__thumb-x):not(.ps__thumb-y), [contenteditable]';
+        var focusableElementsString = 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex="0"]:not(.ps__thumb-x):not(.ps__thumb-y), [contenteditable], button';
         var elements = $(selector).find(focusableElementsString);
         var list = [];
+        //console.log('elements', elements);
         $(elements).each(function () {
             if ($(this).attr('tabindex') == '-1') {
+                //console.log('skip because of tabindex', this);
                 return;
             }
-            if ($(this).parents('[tabindex="-1"],.ignore-tab-children').length === 0 && $(this).is(':visible')) {
+            if ($(this).parents('.ignore-tab-children').length === 0 && $(this).is(':visible')) {
                 list.push(this);
+            } else {
+                //console.log('skip because of parent or not being visible', this);
             }
         });
+        //console.log('list', list);
         this._navigate(list, dir);
     },
 

diff --git a/js/libs/fluidbook/fluidbook.video.js b/js/libs/fluidbook/fluidbook.video.js
index 21e6cb485ef5f88e5b81e6fffbc221e3665b105b..4cfd49dc97f7829ca217bf93cebb875758e1d83d 100644 (file)
--- a/js/libs/fluidbook/fluidbook.video.js
+++ b/js/libs/fluidbook/fluidbook.video.js
@@ -395,7 +395,9 @@ FluidbookVideo.prototype = {
         player.on('ended', function () {
             $this.fluidbook.contentlock.addAction(linkid, 'complete');
         });
-    }, openVideo: function (link) {
+    },
+
+    openVideo: function (link) {
         if (link === undefined) return false;
 
         link = $(link);
@@ -449,7 +451,9 @@ FluidbookVideo.prototype = {
         popup.show();
 
         //console.log(link);
-    }, initCache: function () {
+    },
+
+    initCache: function () {
         var $this = this;
         $('body').append('<iframe id="videoframe" marginheight="0" marginwidth="0" scrolling="no" width="1" height="1" src="data/links/video.' + this.preferedFormat + '.html" frameborder="0"></iframe>');
         $("#videoframe").load(function () {
@@ -464,9 +468,13 @@ FluidbookVideo.prototype = {
             cache.addEventListener('error', $this.logCacheEvent, false);
             $(this).hide();
         });
-    }, logCacheEvent: function (e) {
+    },
+
+    logCacheEvent: function (e) {
+
+    },
 
-    }, pauseAllVideos: function () {
+    pauseAllVideos: function () {
         $('video').each(function () {
             this.pause();
         });

diff --git a/style/videojs/videojs.less b/style/videojs/videojs.less
index 282f688674d41f3bc4271a6210b3bf0123159e62..8709837f608554f96a3fbff912e9d6a6d160f858 100644 (file)
--- a/style/videojs/videojs.less
+++ b/style/videojs/videojs.less
@@ -67,7 +67,6 @@
 
 .vjs-fluidbook-skin .vjs-big-play-button:focus, .vjs-fluidbook-skin .vjs-big-play-button:hover {
   opacity: 1;
-  outline: none;
 }
 
 /* Fix #4362 */
@@ -118,6 +117,5 @@
 }
 
 .video-js .vjs-control:focus:before, .video-js .vjs-control:hover:before, .video-js .vjs-control:focus {
-  outline: none;
   text-shadow: none;
 }
\ No newline at end of file