Completely remove cell from model and view.

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

@@ -77,11 +77,12 b''
                         console.log("Could not determine where the display" + 
                             " message was from.  Widget will not be displayed");
                     } else {
-                        var view = this.create_view(model, msg.content.data.view_name, cell);
+                        var view = this.create_view(model, msg.content.data.view_name);
                         if (view !== undefined 
                             && cell.widget_subarea !== undefined 
                             && cell.widget_subarea !== null) {
                             
+                            view.cell = cell;
                             cell.widget_area.show();
                             cell.widget_subarea.append(view.$el);
                         }
@@ -91,7 +92,11 b''
         }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
         WidgetManager.prototype.create_view = function(model, view_name, cell) {
+=======
+        WidgetManager.prototype.create_view = function(model, view_name, options) {
+>>>>>>> Completely remove cell from model and view.
             view_name = view_name || model.get('default_view_name');
 =======
     WidgetManager.prototype.create_view = function(model, view_name, cell, options) {
@@ -99,7 +104,7 b''
 >>>>>>> Add widget view options in creating child views
             var ViewType = this.widget_view_types[view_name];
             if (ViewType !== undefined && ViewType !== null) {
-                var view = new ViewType({model: model, widget_manager: this, cell: cell, options: options});
+                var view = new ViewType({model: model, widget_manager: this, options: options});
                 view.render();
                 model.views.push(view);
                 model.on('destroy', view.remove, view);
@@ -155,14 +160,14 b''
         },
 
         WidgetManager.prototype.get_msg_cell = function (msg_id) {
-        var cell = null;
+            var cell = null;
             // First, check to see if the msg was triggered by cell execution.
             if (IPython.notebook !== undefined && IPython.notebook !== null) {
                 cell = IPython.notebook.get_msg_cell(msg_id);
             }
-        if (cell !== null) {
-        return cell
-        }
+            if (cell !== null) {
+                return cell
+            }
             // Second, check to see if a get_cell callback was defined
             // for the message.  get_cell callbacks are registered for
             // widget messages, so this block is actually checking to see if the
@@ -183,6 +188,42 b''
             return null;
         };
 
+        WidgetManager.prototype.callbacks = function (view) {
+            // callback handlers specific a view
+            var callbacks = {};
+            var cell = view.cell;
+            if (cell !== null) {
+                // Try to get output handlers
+                var handle_output = null;
+                var handle_clear_output = null;
+                if (cell.output_area !== undefined && cell.output_area !== null) {
+                    handle_output = $.proxy(cell.output_area.handle_output, cell.output_area);
+                    handle_clear_output = $.proxy(cell.output_area.handle_clear_output, cell.output_area);
+                }
+
+                // Create callback dict using what is known
+                var that = this;
+                callbacks = {
+                    iopub : {
+                        output : handle_output,
+                        clear_output : handle_clear_output,
+
+                        status : function (msg) {
+                            view.model._handle_status(msg, that.callbacks());
+                        },
+
+                        // Special function only registered by widget messages.
+                        // Allows us to get the cell for a message so we know
+                        // where to add widgets if the code requires it.
+                        get_cell : function () {
+                            return cell;
+                        },
+                    },
+                };
+            }
+            return callbacks;
+        };
+
 
         WidgetManager.prototype.get_model = function (model_id) {
             var model = this._model_instances[model_id];

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

@@ -172,7 +172,6 b' function(widget_manager, underscore, backbone){'
             this.model.on('change',this.update,this);
             this.widget_manager = options.widget_manager;
             this.comm_manager = options.widget_manager.comm_manager;
-            this.cell = options.cell;
             this.options = options.options;
             this.child_views = [];
             this.model.views.push(this);
@@ -196,7 +195,11 b' function(widget_manager, underscore, backbone){'
 >>>>>>> Updated comm id comments in view to model id
             // if the view name is not given, it defaults to the model's default view attribute
             var child_model = this.widget_manager.get_model(model_id);
+<<<<<<< HEAD
             var child_view = this.widget_manager.create_view(child_model, view_name, this.cell);
+=======
+            var child_view = this.widget_manager.create_view(child_model, view_name, options);
+>>>>>>> Completely remove cell from model and view.
             this.child_views[model_id] = child_view;
 =======
         child_view: function(comm_id, view_name, options) {
@@ -234,47 +237,11 b' function(widget_manager, underscore, backbone){'
             // render the view.  By default, this is only called the first time the view is created
         },
         send: function (content) {
-            this.model.send(content, this._callbacks());
+            this.model.send(content, this.widget_manager.callbacks(this));
         },
 
         touch: function () {
-            this.model.save(this.model.changedAttributes(), {patch: true, callbacks: this._callbacks()});
-        },
-
-        _callbacks: function () {
-            // callback handlers specific to this view's cell
-            var callbacks = {};
-            var cell = this.cell;
-            if (cell !== null) {
-                // Try to get output handlers
-                var handle_output = null;
-                var handle_clear_output = null;
-                if (cell.output_area !== undefined && cell.output_area !== null) {
-                    handle_output = $.proxy(cell.output_area.handle_output, cell.output_area);
-                    handle_clear_output = $.proxy(cell.output_area.handle_clear_output, cell.output_area);
-                }
-
-                // Create callback dict using what is known
-                var that = this;
-                callbacks = {
-                    iopub : {
-                        output : handle_output,
-                        clear_output : handle_clear_output,
-
-                        status : function (msg) {
-                            that.model._handle_status(msg, that._callbacks());
-                        },
-
-                        // Special function only registered by widget messages.
-                        // Allows us to get the cell for a message so we know
-                        // where to add widgets if the code requires it.
-                        get_cell : function () {
-                            return cell;
-                        },
-                    },
-                };
-            }
-            return callbacks;
+            this.model.save(this.model.changedAttributes(), {patch: true, callbacks: this.widget_manager.callbacks(this)});
         },
 
     });