Merge pull request #553 from readium/feature/533ModalFocus

Fixes #533 Focus trapping in Dialogs
readium · Jul 22, 2016 · 926bd72 · 926bd72
2 parents 4d0107b + 435e08f
commit 926bd72
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 45 deletions.
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "jath": "danielweck/jath",
     "mathjax-single-file": "danielweck/MathJax-single-file",
     "bootstrap": "3.x",
-    "bootstrap-accessibility-plugin": "latest",
+    "bootstrap-accessibility-plugin": "paypal/bootstrap-accessibility-plugin",
     "hammerjs": "latest",
     "jquery-hammerjs": "latest",
     "screenfull": "latest",

diff --git a/package/package_base.cson b/package/package_base.cson
@@ -133,7 +133,7 @@ devDependencies:
 
     "bootstrap": '3.x'
 
-    "bootstrap-accessibility-plugin": 'latest'
+    "bootstrap-accessibility-plugin": 'paypal/bootstrap-accessibility-plugin'
 
     "hammerjs": 'latest'
 

diff --git a/src/js/EpubLibrary.js b/src/js/EpubLibrary.js
@@ -124,20 +124,6 @@ Helpers){
 
         $('.details-dialog .modal-body').html(bodyStr);
 
-
-        $('#buttEpubDetailsDelete').on('keydown',function(evt) {
-            if(evt.which === 9 && !(evt.shiftKey | evt.ctrlKey | evt.metaKey | evt.altKey)) { // TAB pressed
-              evt.preventDefault();
-              $('#closeEpubDetailsCross').focus();
-            }
-        });
-        $('#closeEpubDetailsCross').on('keydown',function(evt) {
-            if(evt.which === 9 && evt.shiftKey) { // shift-TAB pressed
-              evt.preventDefault();
-              $('#buttEpubDetailsDelete').focus();
-            }
-        });
-
         $('.details-dialog .delete').on('click', function(){
             $('.details-dialog').modal('hide');
             var success = function(){
@@ -461,19 +447,6 @@ Helpers){
             canHandleDirectory : libraryManager.canHandleDirectory(),
             strings: Strings
         }));
-
-        $('#buttCancelAddEpub').on('keydown',function(evt) {
-            if(evt.which === 9 && !(evt.shiftKey | evt.ctrlKey | evt.metaKey | evt.altKey)) { // TAB pressed
-              evt.preventDefault();
-              $('#closeAddEpubCross').focus();
-            }
-        });
-        $('#closeAddEpubCross').on('keydown',function(evt) {
-            if(evt.which === 9 && evt.shiftKey) { // shift-TAB pressed
-              evt.preventDefault();
-              $('#buttCancelAddEpub').focus();
-            }
-        });
 
         Versioning.getVersioningInfo(function(version){
             $appContainer.append(AboutDialog({imagePathPrefix: moduleConfig.imagePathPrefix, strings: Strings, dateTimeString: version.dateTimeString, viewerJs: version.readiumJsViewer, readiumJs: version.readiumJs, sharedJs: version.readiumSharedJs, cfiJs: version.readiumCfiJs}));

diff --git a/src/js/ReaderSettingsDialog.js b/src/js/ReaderSettingsDialog.js
@@ -102,18 +102,6 @@ define(['./ModuleConfig', 'hgn!readium_js_viewer_html_templates/settings-dialog.
             $("#tab-main").attr('aria-expanded', "false");
             $("#tab-keyboard").attr('aria-expanded', "true");
         });
-        $('#buttSave').on('keydown',function(evt) {
-            if(evt.which === 9 && !(evt.shiftKey | evt.ctrlKey | evt.metaKey | evt.altKey)) { // TAB pressed
-              evt.preventDefault();
-              $('#closeSettingsCross').focus();
-            }
-        });
-        $('#closeSettingsCross').on('keydown',function(evt) {
-            if(evt.which === 9 && evt.shiftKey) { // shift-TAB pressed
-              evt.preventDefault();
-              $('#buttSave').focus();
-            }
-        });
 
         $('#settings-dialog').on('hide.bs.modal', function(){ // IMPORTANT: not "hidden.bs.modal"!! (because .off() in
 

diff --git a/src/templates/add-epub-dialog.html b/src/templates/add-epub-dialog.html
@@ -34,9 +34,9 @@ <h4 class="modal-title" id="add-epub-label">{{strings.i18n_add_book}}</h4>
                 </form>
             </div>
             <div class="modal-footer">
-                <button id="buttAddEpub" tabindex="1000" type="button" class="btn btn-default add-book" data-dismiss="modal" disabled="disabled">{{strings.i18n_add_book}}</button>
+                <button tabindex="1000" type="button" class="btn btn-default add-book" data-dismiss="modal" disabled="disabled">{{strings.i18n_add_book}}</button>
 
-                <button id="buttCancelAddEpub" tabindex="1000" type="button" class="btn btn-primary" data-dismiss="modal">{{strings.i18n_cancel}}</button>
+                <button tabindex="1000" type="button" class="btn btn-primary" data-dismiss="modal">{{strings.i18n_cancel}}</button>
             </div>
         </div>
         <!-- /.modal-content --> 

diff --git a/src/templates/details-body.html b/src/templates/details-body.html
@@ -18,8 +18,8 @@ <h4 class="modal-title" id="epub-details-label">HEADER</h4>
         <div class="no-cover" style="background-image: url('{{data.noCoverBackground}}')"><p>{{data.title}}</p></div>
         {{/data.coverHref}}
         <div class="buttons">
-            <button id="buttEpubDetailsRead" tabindex="1000" class="btn btn-default read" data-dismiss="modal" data-book="{{data.rootUrl}}" type="button">{{strings.i18n_read}}</button>
-            <button id="buttEpubDetailsDelete" tabindex="1000" class="btn btn-danger delete" data-dismiss="modal" type="button">{{strings.i18n_delete}}</button>
+            <button tabindex="1000" class="btn btn-default read" data-dismiss="modal" data-book="{{data.rootUrl}}" type="button">{{strings.i18n_read}}</button>
+            <button tabindex="1000" class="btn btn-danger delete" data-dismiss="modal" type="button">{{strings.i18n_delete}}</button>
         </div>
     </div>
     <div class='modal-book-info'>