Merge pull request #21 from uclixnjupyternbaccessibility/josh-branch

Solved Issues jupyter#3967 and jupyter#4006
uclixnjupyternbaccessibility · Jun 20, 2019 · aa64d9d · aa64d9d
2 parents a1c7766 + 1dbabaa
commit aa64d9d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/notebook/static/base/js/dialog.js b/notebook/static/base/js/dialog.js
@@ -237,6 +237,7 @@ define(['jquery',
         });
 
         modal_obj.on('shown.bs.modal', function(){ editor.refresh(); });
+        modal_obj.on('hide.bs.modal', function(){options.edit_metadata_button.focus(); });
     };
 
     var edit_attachments = function (options) {

diff --git a/notebook/static/notebook/js/celltoolbarpresets/default.js b/notebook/static/notebook/js/celltoolbarpresets/default.js
@@ -10,15 +10,16 @@ define([
 
     var CellToolbar = celltoolbar.CellToolbar;
 
-    var raw_edit = function (cell) {
+    var raw_edit = function (cell , edit_metadata_button) {
         dialog.edit_metadata({
             md: cell.metadata,
             callback: function (md) {
                 cell.metadata = md;
             },
             name: i18n.msg._('Cell'),
             notebook: this.notebook,
-            keyboard_manager: this.keyboard_manager
+            keyboard_manager: this.keyboard_manager,
+            edit_metadata_button: edit_metadata_button
         });
     };
 
@@ -28,9 +29,10 @@ define([
             .addClass("btn btn-default btn-xs")
             .text(i18n.msg._("Edit Metadata"))
             .click( function () {
-                raw_edit(cell);
+                raw_edit(cell, this);
                 return false;
             });
+
         button_container.append(button);
     };
 

diff --git a/notebook/static/notebook/js/notebook.js b/notebook/static/notebook/js/notebook.js
@@ -938,8 +938,7 @@ define([
         if (this.mode !== 'command') {
             cell.command_mode();
             this.mode = 'command';
-            $('div[class*="code_cell"]').attr('aria-label', 'Command Mode')
-                .attr('title', 'Command Mode');
+            $('div[class*="code_cell"]')
             this.events.trigger('command_mode.Notebook');
             this.keyboard_manager.command_mode();
         }
@@ -967,7 +966,7 @@ define([
         if (cell && this.mode !== 'edit') {
             cell.edit_mode();
             this.mode = 'edit';
-            $('div[class*="code_cell"]').attr('aria-label', 'Edit Mode').attr('title', 'Edit Mode');
+            $('div[class*="code_cell"]')
             this.events.trigger('edit_mode.Notebook');
             this.keyboard_manager.edit_mode();
         }

diff --git a/notebook/tests/selenium/geckodriver/geckodriver b/notebook/tests/selenium/geckodriver/geckodriver
diff --git a/notebook/tree/handlers.py b/notebook/tree/handlers.py
@@ -32,7 +32,7 @@ def generate_page_title(self, path):
         if page_title:
             return page_title+'/'
         else:
-            return 'Home'
+            return 'Home Page - Select or create a notebook'
 
     @web.authenticated
     def get(self, path=''):
-Original file line number
+Diff line change
@@ Expand Up / @@ -237,6 +237,7 @@ define(['jquery', @@
             });
             modal_obj.on('shown.bs.modal', function(){ editor.refresh(); });
+            modal_obj.on('hide.bs.modal', function(){options.edit_metadata_button.focus(); });
         };
         var edit_attachments = function (options) {
@@ Expand Down @@