simplify manager.set_state

Author: SylvainCorlay

ipywidgets/static/widgets/js/manager.js

@@ -308,7 +308,7 @@ define([
         return this.new_model(options);
     }
 
-    WidgetManager.prototype.new_model = function (options, create_comm) {
+    WidgetManager.prototype.new_model = function (options) {
         /**
          * Create and return a promise for a new widget model
          *
@@ -336,7 +336,9 @@ define([
          *      widget_class: (optional) string
          *          Target name of the widget in the back-end.
          *      comm: (optional) Comm
+         *           Comm object associated with the widget.
          *      model_id: (optional) string
+         *           If not provided, the comm id is used.
          *
          * Either a comm or a model_id must be provided.
          */
@@ -439,32 +441,30 @@ define([
             // Recreate all the widget models for the given notebook state.
             var all_models = that._get_comm_info(kernel).then(function(live_comms) {
                 return Promise.all(_.map(Object.keys(state), function (model_id) {
-                    // Creates a comm using the widget's model id. 
-                    var live = live_comms.hasOwnProperty(model_id);
-                    var new_comm;
-                    if (live) {
-                        new_comm = new comm.Comm(kernel.widget_manager.comm_target_name, model_id);
+                    if (live_comms.hasOwnProperty(model_id)) {  // live comm
+                        var new_comm = new comm.Comm(kernel.widget_manager.comm_target_name, model_id);
                         kernel.comm_manager.register_comm(new_comm);
-                    } else {
-                        new_comm = void 0;
-                    }
-                    return kernel.widget_manager.new_model({
-                        comm: new_comm,
-                        model_name: state[model_id].model_name,
-                        model_module: state[model_id].model_module,
-                        model_id: model_id,
-                    }).then(function(model) {
-                        if (live) {
+                        return kernel.widget_manager.new_model({
+                            comm: new_comm,
+                            model_name: state[model_id].model_name,
+                            model_module: state[model_id].model_module,
+                        }).then(function(model) {
                             return model.request_state().then(function() {
                                 return model;
                             });
-                        } else {
-                            return model._deserialize_state(state[model.id].state).then(function(state) {
+                        });
+                    } else { // dead comm
+                        return kernel.widget_manager.new_model({
+                            model_id: model_id,
+                            model_name: state[model_id].model_name,
+                            model_module: state[model_id].model_module,
+                        }).then(function(model) {
+                            return model._deserialize_state(state[model_id].state).then(function(state) {
                                 model.set_state(state);
                                 return model;
                             });
-                        }
-                    });
+                        });
+                    }
                 }));
             });