Custom widget persistence

IPython/html/static/widgets/js/manager.js

@@ -284,7 +284,8 b' define(['
         return this.create_model({
             model_name: msg.content.data.model_name, 
             model_module: msg.content.data.model_module, 
-            comm: comm}).catch(utils.reject("Couldn't create a model.", true));
+            comm: comm,
+        }).catch(utils.reject("Couldn't create a model.", true));
     };
 
     WidgetManager.prototype.create_model = function (options) {
@@ -299,7 +300,8 b' define(['
          * JS:
          * IPython.notebook.kernel.widget_manager.create_model({
          *      model_name: 'WidgetModel', 
-         *      widget_class: 'IPython.html.widgets.widget_int.IntSlider'})
+         *      widget_class: 'IPython.html.widgets.widget_int.IntSlider'
+         *  })
          *      .then(function(model) { console.log('Create success!', model); },
          *      $.proxy(console.error, console));
          *
@@ -416,13 +418,8 b' define(['
         var that = this;
         return this._get_connected_kernel().then(function(kernel) {
             
-            // Recreate all the widget models for the given state and 
-            // display the views.
-            that.all_views = [];
-            var model_ids = Object.keys(state);
-            for (var i = 0; i < model_ids.length; i++) {
-                var model_id = model_ids[i];
-                
+            // Recreate all the widget models for the given notebook state.
+            var all_models = Promise.all(_.map(Object.keys(state), function (model_id) {
                 // Recreate a comm using the widget's model id (model_id == comm_id).
                 var new_comm = new comm.Comm(kernel.widget_manager.comm_target_name, model_id);
                 kernel.comm_manager.register_comm(new_comm);
@@ -431,35 +428,30 b' define(['
                 // created we don't know yet if the comm is valid so set_comm_live
                 // false.  Once we receive the first state push from the back-end
                 // we know the comm is alive.
-                var views = kernel.widget_manager.create_model({
+                return kernel.widget_manager.create_model({
                     comm: new_comm, 
                     model_name: state[model_id].model_name, 
-                    model_module: state[model_id].model_module})
-                .then(function(model) {
-
+                    model_module: state[model_id].model_module,
+                }).then(function(model) {
                     model.set_comm_live(false);
-                    var view_promise = Promise.resolve().then(function() {
-                        return model.set_state(state[model.id].state);
-                    }).then(function() {
-                        model.request_state().then(function() {
+                    model.set_state(state[model.id].state);
+                    return model.request_state().then(function() {
                             model.set_comm_live(true);
+                        return model;
                         });
+                });
+            }, this));
 
+            // Display all the views
+            return all_models.then(function(models) {
+                return Promise.all(_.map(models, function(model) {
                         // Display the views of the model.
-                        var views = [];
-                        var model_views = state[model.id].views;
-                        for (var j=0; j<model_views.length; j++) {
-                            var cell_index = model_views[j];
+                    return Promise.all(_.map(state[model.id].views, function(cell_index) {
                             var cell = that.notebook.get_cell(cell_index);
-                            views.push(that.display_view_in_cell(cell, model));
-                        }
-                        return Promise.all(views);
-                    });
-                    return view_promise;
+                        return that.display_view_in_cell(cell, model);
+                    }));
+                }));
                 });
-                that.all_views.push(views);
-            }
-            return Promise.all(that.all_views);
         }).catch(utils.reject('Could not set widget manager state.', true));  
     };