Handle shift+enter behavior in nbagg

Partial implementation of shift+enter in nbagg

Use the J key command to move to next cell

Remove errant change to uat

Add a comment and handle IPython 2/3

Move the shift+enter handling to nbagg_mpl

Add explicit mode switch for shift+enter

Clean up handling of keyboard manager variable

Remove extraneous changes

Remove unused import

Remove newline change

Author: blink1073

lib/matplotlib/backends/backend_webagg_core.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Displays Agg images in the browser, with interactivity
 """
@@ -19,7 +18,6 @@
 import io
 import json
 import os
-import re
 import time
 import warnings
 

lib/matplotlib/backends/web_backend/mpl.js

@@ -458,6 +458,10 @@ mpl.figure.prototype.mouse_event = function(event, name) {
     return false;
 }
 
+mpl.figure.prototype._key_event_extra = function(event, name) { 
+
+}
+
 mpl.figure.prototype.key_event = function(event, name) {
 
     // Prevent repeat events
@@ -482,6 +486,8 @@ mpl.figure.prototype.key_event = function(event, name) {
     value += 'k';
     value += event.which.toString();
 
+    this._key_event_extra(event, name);
+
     this.send_message(name, {key: value});
     return false;
 }

lib/matplotlib/backends/web_backend/nbagg_mpl.js

@@ -149,6 +149,22 @@ mpl.figure.prototype._canvas_extra_style = function(el){
 
 }
 
+mpl.figure.prototype._key_event_extra = function(event, name) { 
+    var manager = IPython.notebook.keyboard_manager;
+    if (!manager)
+        IPython.keyboard_manager;
+
+    // Check for shift+enter
+    if (event.shiftKey && event.which == 13) {
+        this.canvas_div.blur();
+        event.shiftKey = false;
+        // Send a "J" for go to next cell
+        event.which = 74;
+        event.keyCode = 74;
+        manager.command_mode();
+        manager.handle_keydown(event);
+    }
+}
 
 mpl.figure.prototype.handle_save = function(fig, msg) {
     fig.ondownload(fig, null);