mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed merge conflicts

Browse Source
This commit is contained in:
Joshua Zeltser 2019-06-24 16:34:08 +01:00
parent 1a9a096f9c
commit fc2c46141d
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
notebook/static/notebook/js/notebook.js
View File

@ -938,7 +938,6 @@ define([
if (this.mode !== 'command') { if (this.mode !== 'command') {
cell.command_mode(); cell.command_mode();
this.mode = 'command'; this.mode = 'command';
$('div[class*="code_cell"]')
this.events.trigger('command_mode.Notebook'); this.events.trigger('command_mode.Notebook');
this.keyboard_manager.command_mode(); this.keyboard_manager.command_mode();
} }
@ -966,10 +965,6 @@ define([
if (cell && this.mode !== 'edit') { if (cell && this.mode !== 'edit') {
cell.edit_mode(); cell.edit_mode();
this.mode = 'edit'; this.mode = 'edit';
<<<<<<< HEAD
=======
$('div[class*="code_cell"]')
>>>>>>> 1dbabaa0a... #4006: fixed the edit-metadata button so that focus returns to it after closing the popup
this.events.trigger('edit_mode.Notebook'); this.events.trigger('edit_mode.Notebook');
this.keyboard_manager.edit_mode(); this.keyboard_manager.edit_mode();
} }