Re-decoupled comm_id from widget models

IPython/html/static/notebook/js/widgetmanager.js

@@ -66,6 +66,8 b''
         WidgetManager.prototype.register_widget_view = function (widget_view_name, widget_view_type) {
             this.widget_view_types[widget_view_name] = widget_view_type;
         };
+
+
     WidgetManager.prototype.handle_msg = function(msg, model) {
         var method = msg.content.data.method;
         switch (method) {
@@ -117,7 +119,7 b''
                             delete that.comm.model; // Delete ref so GC will collect widget model.
                             delete that.comm;
                         }
-                        delete that.widget_id; // Delete id from model so widget manager cleans up.
+                            delete that.model_id; // Delete id from model so widget manager cleans up.
                     });
         */
                 return view;
@@ -154,9 +156,9 b''
         };
 
 
-        WidgetManager.prototype.get_model = function (widget_id) {
-            var model = this._model_instances[widget_id];
-            if (model !== undefined && model.id == widget_id) {
+        WidgetManager.prototype.get_model = function (model_id) {
+            var model = this._model_instances[model_id];
+            if (model !== undefined && model.id == model_id) {
                 return model;
             }
             return null;
@@ -191,7 +193,7 b''
         WidgetManager.prototype._handle_comm_open = function (comm, msg) {
             var widget_type_name = msg.content.target_name;
             var widget_model = new this.widget_model_types[widget_type_name](this, comm.comm_id, comm);
-            this._model_instances[comm.comm_id] = widget_model;
+            this._model_instances[comm.comm_id] = widget_model; // comm_id == model_id
             this._handle_create_widget(widget_model);
         };
         

IPython/html/static/notebook/js/widgets/base.js

@@ -23,12 +23,12 b' function(widget_manager, underscore, backbone){'
     // WidgetModel class
     //--------------------------------------------------------------------
     var WidgetModel = Backbone.Model.extend({
-        constructor: function (widget_manager, widget_id, comm) {
+        constructor: function (widget_manager, model_id, comm) {
             this.widget_manager = widget_manager;
             this.pending_msgs = 0;
             this.msg_throttle = 3;
             this.msg_buffer = null;
-            this.id = widget_id;
+            this.id = model_id;
             this.views = [];
 
             if (comm !== undefined) {
@@ -55,7 +55,7 b' function(widget_manager, underscore, backbone){'
             this.trigger('comm:close');
             delete this.comm.model; // Delete ref so GC will collect widget model.
             delete this.comm;
-            delete this.widget_id; // Delete id from model so widget manager cleans up.
+            delete this.model_id; // Delete id from model so widget manager cleans up.
             // TODO: Handle deletion, like this.destroy(), and delete views, etc.
         },
 
@@ -181,12 +181,12 b' function(widget_manager, underscore, backbone){'
             // triggered on model change
         },
 
-        child_view: function(comm_id, view_name) {
+        child_view: function(model_id, view_name) {
             // create and return a child view, given a comm id for a model and (optionally) a view name
             // if the view name is not given, it defaults to the model's default view attribute
-            var child_model = this.comm_manager.comms[comm_id].model;
+            var child_model = this.widget_manager.get_model(model_id);
             var child_view = this.widget_manager.create_view(child_model, view_name, this.cell);
-            this.child_views[comm_id] = child_view;
+            this.child_views[model_id] = child_view;
             return child_view;
         },
         

IPython/html/widgets/widget.py

@@ -100,6 +100,10 b' class BaseWidget(LoggingConfigurable):'
             self._open_communication()
         return self._comm
 
+    @property
+    def model_id(self):
+        return self._comm.comm_id
+
     # Event handlers
     def _handle_msg(self, msg):
         """Called when a msg is recieved from the frontend"""
@@ -220,10 +224,10 b' class BaseWidget(LoggingConfigurable):'
             # encoder to look for a _repr_json property before giving
             # up encoding
             if isinstance(value, BaseWidget):
-                value = value.comm.comm_id
+                value = value.model_id
             elif isinstance(value, list) and len(value)>0 and isinstance(value[0], BaseWidget):
                 # assume all elements of the list are widgets
-                value = [i.comm.comm_id for i in value]
+                value = [i.model_id for i in value]
             state[k] = value
         return state