Merge pull request #1341 from jasongrout/spread

Use the spread operator instead of underscore’s extend.
jupyter-widgets · May 11, 2017 · 386ae4d · 386ae4d
2 parents 25607fb + f71a492
commit 386ae4d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/jupyter-js-widgets/src/widget.ts b/jupyter-js-widgets/src/widget.ts
@@ -536,10 +536,11 @@ class WidgetModel extends Backbone.Model {
 
 export
 class DOMWidgetModel extends WidgetModel {
-    static serializers = _.extend({
+    static serializers = {
+        ...WidgetModel.serializers,
         layout: {deserialize: unpack_models},
         style: {deserialize: unpack_models},
-    }, WidgetModel.serializers)
+    }
 
     defaults() {
         return _.extend(super.defaults(), {

diff --git a/jupyter-js-widgets/src/widget_box.ts b/jupyter-js-widgets/src/widget_box.ts
@@ -79,9 +79,10 @@ class BoxModel extends CoreDOMWidgetModel {
         });
     }
 
-    static serializers = _.extend({
+    static serializers = {
+        ...CoreDOMWidgetModel.serializers,
         children: {deserialize: unpack_models}
-    }, CoreDOMWidgetModel.serializers)
+    }
 }
 
 export

diff --git a/jupyter-js-widgets/src/widget_controller.ts b/jupyter-js-widgets/src/widget_controller.ts
@@ -126,10 +126,11 @@ class ControllerAxisView extends DOMWidgetView {
 
 export
 class ControllerModel extends CoreDOMWidgetModel {
-    static serializers = _.extend({
+    static serializers = {
+        ...CoreDOMWidgetModel.serializers,
         buttons: {deserialize: unpack_models},
         axes: {deserialize: unpack_models}
-    }, CoreDOMWidgetModel.serializers)
+    }
 
     defaults() {
         return _.extend(super.defaults(), {

diff --git a/jupyter-js-widgets/src/widget_date.ts b/jupyter-js-widgets/src/widget_date.ts
@@ -80,12 +80,13 @@ function convertDateToUTC(date) {
 
 export
 class DatePickerModel extends CoreLabeledDOMWidgetModel {
-    static serializers = _.extend({
+    static serializers = {
+        ...CoreLabeledDOMWidgetModel.serializers,
         value: {
             serialize: serialize_datetime,
             deserialize: deserialize_datetime
         }
-    }, CoreLabeledDOMWidgetModel.serializers)
+    }
 
     defaults() {
         return _.extend(super.defaults(), {

diff --git a/jupyter-js-widgets/src/widget_link.ts b/jupyter-js-widgets/src/widget_link.ts
@@ -14,10 +14,11 @@ import * as _ from 'underscore';
 
 export
 class DirectionalLinkModel extends CoreWidgetModel {
-    static serializers = _.extend({
+    static serializers = {
+        ...CoreWidgetModel.serializers,
         target: {deserialize: unpack_models},
         source: {deserialize: unpack_models}
-    }, CoreWidgetModel.serializers)
+    }
 
     defaults() {
         return _.extend(super.defaults(), {