Remove all nested objects

blink1073 · blink1073 · commit 0c3416d8a9ed · 2015-02-15T22:38:06.000-06:00
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -461,7 +461,8 @@ mpl.findpos = function(e) {
  */
 function simpleKeys (original) {
   return Object.keys(original).reduce(function (obj, key) {
-    obj[key] = typeof original[key] === 'object' ? '{ ... }' : original[key];
+    if (typeof original[key] !== 'object')
+        obj[key] = original[key]
     return obj;
   }, {});
 }
@@ -477,12 +478,10 @@ mpl.figure.prototype.mouse_event = function(event, name) {
 
     var x = canvas_pos.x;
     var y = canvas_pos.y;
-    var guiEvent = simpleKeys(event);
 
-    guiEvent.originalEvent = simpleKeys(event.originalEvent);
     this.send_message(name, {x: x, y: y, button: event.button,
                              step: event.step,
-                             guiEvent: guiEvent});
+                             guiEvent: simpleKeys(event)});
 
     /* This prevents the web browser from automatically changing to
      * the text insertion cursor when the button is pressed.  We want
@@ -522,12 +521,8 @@ mpl.figure.prototype.key_event = function(event, name) {
 
     this._key_event_extra(event, name);
 
-    var guiEvent = simpleKeys(event);
-
-    guiEvent.originalEvent = simpleKeys(event.originalEvent);
-
     this.send_message(name, {key: value,
-                             guiEvent: guiEvent});
+                             guiEvent: simpleKeys(event)});
     return false;
 }
 
