Merge pull request #2725 from jasongrout/es2017

Upgrade to es2017 javascript
jupyter-widgets · Jan 11, 2020 · 1a7bc57 · 1a7bc57
2 parents 0cdae8f + f9cb7af
commit 1a7bc57
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 53 deletions.
diff --git a/packages/base-manager/test/tsconfig.json b/packages/base-manager/test/tsconfig.json
@@ -3,9 +3,7 @@
   "compilerOptions": {
     "types": ["mocha"],
     "outDir": "build",
-    "rootDir": "src",
-    "lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
-    "target": "es5"
+    "rootDir": "src"
   },
   "include": ["src/*"],
   "references": [

diff --git a/packages/base-manager/tsconfig.json b/packages/base-manager/tsconfig.json
@@ -2,9 +2,7 @@
   "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
-    "rootDir": "src",
-    "lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
-    "target": "es5"
+    "rootDir": "src"
   },
   "include": ["src/*"],
   "references": [

diff --git a/packages/base/test/tsconfig.json b/packages/base/test/tsconfig.json
@@ -3,9 +3,7 @@
   "compilerOptions": {
     "types": ["mocha"],
     "outDir": "build",
-    "rootDir": "src",
-    "lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
-    "target": "es5"
+    "rootDir": "src"
   },
   "include": ["src/*"],
   "references": [

diff --git a/packages/base/tsconfig.json b/packages/base/tsconfig.json
@@ -2,9 +2,7 @@
   "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
-    "rootDir": "src",
-    "lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
-    "target": "es5"
+    "rootDir": "src"
   },
   "include": ["src/*"]
 }
diff --git a/packages/controls/test/tsconfig.json b/packages/controls/test/tsconfig.json
@@ -3,9 +3,7 @@
   "compilerOptions": {
     "types": ["mocha"],
     "outDir": "build",
-    "rootDir": "src",
-    "lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
-    "target": "es5"
+    "rootDir": "src"
   },
   "include": ["src/**/*"],
   "references": [

diff --git a/packages/controls/tsconfig.json b/packages/controls/tsconfig.json
@@ -3,9 +3,7 @@
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",
-    "types": ["mathjax", "node"],
-    "lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
-    "target": "es5"
+    "types": ["mathjax", "node"]
   },
   "include": ["src/**/*"],
   "references": [

diff --git a/packages/output/tsconfig.json b/packages/output/tsconfig.json
@@ -2,9 +2,7 @@
   "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
-    "rootDir": "src",
-    "lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
-    "target": "es5"
+    "rootDir": "src"
   },
   "include": ["src/**/*"],
   "references": [

diff --git a/widgetsnbextension/src/widget_output.js b/widgetsnbextension/src/widget_output.js
@@ -4,23 +4,24 @@
 
 // This widget is strongly coupled to the notebook because of the outputarea
 // dependency.
-var widgets = require("@jupyter-widgets/controls");
 var outputBase = require("@jupyter-widgets/output");
-var _ = require("underscore");
 require('./widget_output.css');
 
 var outputArea = new Promise(function(resolve, reject) {
         requirejs(["notebook/js/outputarea"], resolve, reject)
 });
 
-var OutputModel = outputBase.OutputModel.extend({
-    defaults: _.extend({}, outputBase.OutputModel.prototype.defaults(), {
-        msg_id: "",
-        outputs: []
-    }),
+export class OutputModel extends outputBase.OutputModel {
+    defaults() {
+        return {
+            ...super.defaults(),
+            msg_id: "",
+            outputs: []    
+        }
+    }
 
-    initialize: function(attributes, options) {
-        OutputModel.__super__.initialize.apply(this, arguments);
+    initialize(attributes, options) {
+        super.initialize(attributes, options)
         this.listenTo(this, 'change:msg_id', this.reset_msg_id);
 
         if (this.comm && this.comm.kernel) {
@@ -50,14 +51,14 @@ var OutputModel = outputBase.OutputModel.extend({
             that.listenTo(that, 'change:outputs', that.setOutputs);
             that.setOutputs();
         });
-    },
+    }
 
     // make callbacks
-    callbacks: function() {
+    callbacks() {
         // Merge our callbacks with the base class callbacks.
-        var cb = OutputModel.__super__.callbacks.apply(this, arguments);
+        var cb = super.callbacks();
         var iopub = cb.iopub || {};
-        var iopubCallbacks = _.extend({}, iopub, {
+        var iopubCallbacks = {...iopub,
             output: function(msg) {
                 this.trigger('new_message', msg);
                 if (iopub.output) {
@@ -70,11 +71,11 @@ var OutputModel = outputBase.OutputModel.extend({
                     iopub.clear_output.apply(this, arguments);
                 }
             }.bind(this)
-        });
-        return _.extend({}, cb, {iopub: iopubCallbacks});
-    },
+        };
+        return {...cb, iopub: iopubCallbacks};
+    }
 
-    reset_msg_id: function() {
+    reset_msg_id() {
         var kernel = this.kernel;
         // Pop previous message id
         var prev_msg_id = this.previous('msg_id');
@@ -88,21 +89,21 @@ var OutputModel = outputBase.OutputModel.extend({
         if (msg_id && kernel) {
             kernel.output_callback_overrides_push(msg_id, this.model_id);
         }
-    },
+    }
 
-    setOutputs: function(model, value, options) {
+    setOutputs(model, value, options) {
         if (!(options && options.newMessage)) {
             // fromJSON does not clear the existing output
             this.output_area.clear_output();
             // fromJSON does not copy the message, so we make a deep copy
             this.output_area.fromJSON(JSON.parse(JSON.stringify(this.get('outputs'))));
         }
-    },
+    }
 
-});
+}
 
-var OutputView = outputBase.OutputView.extend({
-    render: function(){
+export class OutputView extends outputBase.OutputView {
+    render(){
         var that = this;
         this.el.classList.add('jupyter-widgets-output-area');
         outputArea.then(function(outputArea) {
@@ -128,20 +129,15 @@ var OutputView = outputBase.OutputView.extend({
             that.listenTo(that.model, 'change:outputs', that.setOutputs);
             that.setOutputs();
         });
-        OutputView.__super__.render.apply(this, arguments);
-    },
+        super.render();
+    }
 
-    setOutputs: function(model, value, options) {
+    setOutputs(model, value, options) {
         if (!(options && options.newMessage)) {
             // fromJSON does not clear the existing output
             this.output_area.clear_output();
             // fromJSON does not copy the message, so we make a deep copy
             this.output_area.fromJSON(JSON.parse(JSON.stringify(this.model.get('outputs'))));
         }
     }
-});
-
-module.exports = {
-    OutputView: OutputView,
-    OutputModel: OutputModel,
-};
+}