From 95df2eb9f2761ef4e25b497bc10fb80612cf6afb Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 17 Apr 2015 12:22:15 -0700
Subject: [PATCH 1/9] Move widget files for the small split.

---
 .../static => ipython_widgets/static/widgets}/widgets/js/init.js  | 0
 .../static/widgets}/widgets/js/manager.js                         | 0
 .../static/widgets}/widgets/js/widget.js                          | 0
 .../static/widgets}/widgets/js/widget_bool.js                     | 0
 .../static/widgets}/widgets/js/widget_box.js                      | 0
 .../static/widgets}/widgets/js/widget_button.js                   | 0
 .../static/widgets}/widgets/js/widget_float.js                    | 0
 .../static/widgets}/widgets/js/widget_image.js                    | 0
 .../static/widgets}/widgets/js/widget_int.js                      | 0
 .../static/widgets}/widgets/js/widget_link.js                     | 0
 .../static/widgets}/widgets/js/widget_output.js                   | 0
 .../static/widgets}/widgets/js/widget_selection.js                | 0
 .../static/widgets}/widgets/js/widget_selectioncontainer.js       | 0
 .../static/widgets}/widgets/js/widget_string.js                   | 0
 .../static/widgets}/widgets/less/widgets.less                     | 0
 {jupyter_notebook => ipython_widgets}/widgets/__init__.py         | 0
 {jupyter_notebook => ipython_widgets}/widgets/deprecated.py       | 0
 {jupyter_notebook => ipython_widgets}/widgets/eventful.py         | 0
 {jupyter_notebook => ipython_widgets}/widgets/interaction.py      | 0
 {jupyter_notebook => ipython_widgets}/widgets/tests/__init__.py   | 0
 .../widgets/tests/test_interaction.py                             | 0
 {jupyter_notebook => ipython_widgets}/widgets/tests/test_link.py  | 0
 .../widgets/tests/test_traits.py                                  | 0
 {jupyter_notebook => ipython_widgets}/widgets/trait_types.py      | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget.py           | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_bool.py      | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_box.py       | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_button.py    | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_float.py     | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_image.py     | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_int.py       | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_link.py      | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_output.py    | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_selection.py | 0
 .../widgets/widget_selectioncontainer.py                          | 0
 {jupyter_notebook => ipython_widgets}/widgets/widget_string.py    | 0
 36 files changed, 0 insertions(+), 0 deletions(-)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/init.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/manager.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_bool.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_box.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_button.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_float.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_image.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_int.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_link.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_output.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_selection.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_selectioncontainer.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/js/widget_string.js (100%)
 rename {jupyter_notebook/static => ipython_widgets/static/widgets}/widgets/less/widgets.less (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/__init__.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/deprecated.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/eventful.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/interaction.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/tests/__init__.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/tests/test_interaction.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/tests/test_link.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/tests/test_traits.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/trait_types.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_bool.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_box.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_button.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_float.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_image.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_int.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_link.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_output.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_selection.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_selectioncontainer.py (100%)
 rename {jupyter_notebook => ipython_widgets}/widgets/widget_string.py (100%)

diff --git a/jupyter_notebook/static/widgets/js/init.js b/ipython_widgets/static/widgets/widgets/js/init.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/init.js
rename to ipython_widgets/static/widgets/widgets/js/init.js
diff --git a/jupyter_notebook/static/widgets/js/manager.js b/ipython_widgets/static/widgets/widgets/js/manager.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/manager.js
rename to ipython_widgets/static/widgets/widgets/js/manager.js
diff --git a/jupyter_notebook/static/widgets/js/widget.js b/ipython_widgets/static/widgets/widgets/js/widget.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget.js
rename to ipython_widgets/static/widgets/widgets/js/widget.js
diff --git a/jupyter_notebook/static/widgets/js/widget_bool.js b/ipython_widgets/static/widgets/widgets/js/widget_bool.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_bool.js
rename to ipython_widgets/static/widgets/widgets/js/widget_bool.js
diff --git a/jupyter_notebook/static/widgets/js/widget_box.js b/ipython_widgets/static/widgets/widgets/js/widget_box.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_box.js
rename to ipython_widgets/static/widgets/widgets/js/widget_box.js
diff --git a/jupyter_notebook/static/widgets/js/widget_button.js b/ipython_widgets/static/widgets/widgets/js/widget_button.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_button.js
rename to ipython_widgets/static/widgets/widgets/js/widget_button.js
diff --git a/jupyter_notebook/static/widgets/js/widget_float.js b/ipython_widgets/static/widgets/widgets/js/widget_float.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_float.js
rename to ipython_widgets/static/widgets/widgets/js/widget_float.js
diff --git a/jupyter_notebook/static/widgets/js/widget_image.js b/ipython_widgets/static/widgets/widgets/js/widget_image.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_image.js
rename to ipython_widgets/static/widgets/widgets/js/widget_image.js
diff --git a/jupyter_notebook/static/widgets/js/widget_int.js b/ipython_widgets/static/widgets/widgets/js/widget_int.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_int.js
rename to ipython_widgets/static/widgets/widgets/js/widget_int.js
diff --git a/jupyter_notebook/static/widgets/js/widget_link.js b/ipython_widgets/static/widgets/widgets/js/widget_link.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_link.js
rename to ipython_widgets/static/widgets/widgets/js/widget_link.js
diff --git a/jupyter_notebook/static/widgets/js/widget_output.js b/ipython_widgets/static/widgets/widgets/js/widget_output.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_output.js
rename to ipython_widgets/static/widgets/widgets/js/widget_output.js
diff --git a/jupyter_notebook/static/widgets/js/widget_selection.js b/ipython_widgets/static/widgets/widgets/js/widget_selection.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_selection.js
rename to ipython_widgets/static/widgets/widgets/js/widget_selection.js
diff --git a/jupyter_notebook/static/widgets/js/widget_selectioncontainer.js b/ipython_widgets/static/widgets/widgets/js/widget_selectioncontainer.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_selectioncontainer.js
rename to ipython_widgets/static/widgets/widgets/js/widget_selectioncontainer.js
diff --git a/jupyter_notebook/static/widgets/js/widget_string.js b/ipython_widgets/static/widgets/widgets/js/widget_string.js
similarity index 100%
rename from jupyter_notebook/static/widgets/js/widget_string.js
rename to ipython_widgets/static/widgets/widgets/js/widget_string.js
diff --git a/jupyter_notebook/static/widgets/less/widgets.less b/ipython_widgets/static/widgets/widgets/less/widgets.less
similarity index 100%
rename from jupyter_notebook/static/widgets/less/widgets.less
rename to ipython_widgets/static/widgets/widgets/less/widgets.less
diff --git a/jupyter_notebook/widgets/__init__.py b/ipython_widgets/widgets/__init__.py
similarity index 100%
rename from jupyter_notebook/widgets/__init__.py
rename to ipython_widgets/widgets/__init__.py
diff --git a/jupyter_notebook/widgets/deprecated.py b/ipython_widgets/widgets/deprecated.py
similarity index 100%
rename from jupyter_notebook/widgets/deprecated.py
rename to ipython_widgets/widgets/deprecated.py
diff --git a/jupyter_notebook/widgets/eventful.py b/ipython_widgets/widgets/eventful.py
similarity index 100%
rename from jupyter_notebook/widgets/eventful.py
rename to ipython_widgets/widgets/eventful.py
diff --git a/jupyter_notebook/widgets/interaction.py b/ipython_widgets/widgets/interaction.py
similarity index 100%
rename from jupyter_notebook/widgets/interaction.py
rename to ipython_widgets/widgets/interaction.py
diff --git a/jupyter_notebook/widgets/tests/__init__.py b/ipython_widgets/widgets/tests/__init__.py
similarity index 100%
rename from jupyter_notebook/widgets/tests/__init__.py
rename to ipython_widgets/widgets/tests/__init__.py
diff --git a/jupyter_notebook/widgets/tests/test_interaction.py b/ipython_widgets/widgets/tests/test_interaction.py
similarity index 100%
rename from jupyter_notebook/widgets/tests/test_interaction.py
rename to ipython_widgets/widgets/tests/test_interaction.py
diff --git a/jupyter_notebook/widgets/tests/test_link.py b/ipython_widgets/widgets/tests/test_link.py
similarity index 100%
rename from jupyter_notebook/widgets/tests/test_link.py
rename to ipython_widgets/widgets/tests/test_link.py
diff --git a/jupyter_notebook/widgets/tests/test_traits.py b/ipython_widgets/widgets/tests/test_traits.py
similarity index 100%
rename from jupyter_notebook/widgets/tests/test_traits.py
rename to ipython_widgets/widgets/tests/test_traits.py
diff --git a/jupyter_notebook/widgets/trait_types.py b/ipython_widgets/widgets/trait_types.py
similarity index 100%
rename from jupyter_notebook/widgets/trait_types.py
rename to ipython_widgets/widgets/trait_types.py
diff --git a/jupyter_notebook/widgets/widget.py b/ipython_widgets/widgets/widget.py
similarity index 100%
rename from jupyter_notebook/widgets/widget.py
rename to ipython_widgets/widgets/widget.py
diff --git a/jupyter_notebook/widgets/widget_bool.py b/ipython_widgets/widgets/widget_bool.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_bool.py
rename to ipython_widgets/widgets/widget_bool.py
diff --git a/jupyter_notebook/widgets/widget_box.py b/ipython_widgets/widgets/widget_box.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_box.py
rename to ipython_widgets/widgets/widget_box.py
diff --git a/jupyter_notebook/widgets/widget_button.py b/ipython_widgets/widgets/widget_button.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_button.py
rename to ipython_widgets/widgets/widget_button.py
diff --git a/jupyter_notebook/widgets/widget_float.py b/ipython_widgets/widgets/widget_float.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_float.py
rename to ipython_widgets/widgets/widget_float.py
diff --git a/jupyter_notebook/widgets/widget_image.py b/ipython_widgets/widgets/widget_image.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_image.py
rename to ipython_widgets/widgets/widget_image.py
diff --git a/jupyter_notebook/widgets/widget_int.py b/ipython_widgets/widgets/widget_int.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_int.py
rename to ipython_widgets/widgets/widget_int.py
diff --git a/jupyter_notebook/widgets/widget_link.py b/ipython_widgets/widgets/widget_link.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_link.py
rename to ipython_widgets/widgets/widget_link.py
diff --git a/jupyter_notebook/widgets/widget_output.py b/ipython_widgets/widgets/widget_output.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_output.py
rename to ipython_widgets/widgets/widget_output.py
diff --git a/jupyter_notebook/widgets/widget_selection.py b/ipython_widgets/widgets/widget_selection.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_selection.py
rename to ipython_widgets/widgets/widget_selection.py
diff --git a/jupyter_notebook/widgets/widget_selectioncontainer.py b/ipython_widgets/widgets/widget_selectioncontainer.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_selectioncontainer.py
rename to ipython_widgets/widgets/widget_selectioncontainer.py
diff --git a/jupyter_notebook/widgets/widget_string.py b/ipython_widgets/widgets/widget_string.py
similarity index 100%
rename from jupyter_notebook/widgets/widget_string.py
rename to ipython_widgets/widgets/widget_string.py

From 1deefae2f21ed6a521912d41257be5c92db630a8 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 17 Apr 2015 12:23:02 -0700
Subject: [PATCH 2/9] Remove widget/CodeCell coupling code.

---
 .../static/notebook/js/widgetarea.js          | 116 ++++++++++++++++++
 .../static/notebook/js/codecell.js            | 108 +---------------
 2 files changed, 117 insertions(+), 107 deletions(-)
 create mode 100644 ipython_widgets/static/notebook/js/widgetarea.js

diff --git a/ipython_widgets/static/notebook/js/widgetarea.js b/ipython_widgets/static/notebook/js/widgetarea.js
new file mode 100644
index 0000000000..75b93ba2d4
--- /dev/null
+++ b/ipython_widgets/static/notebook/js/widgetarea.js
@@ -0,0 +1,116 @@
+
+// Events that this code should rely on.
+// delete.Cell
+// selected_cell_type_changed.Notebook
+// create.Cell
+
+        this.widget_views = [];
+        this._widgets_live = true;
+
+        var widget_area = $('<div/>')
+            .addClass('widget-area')
+            .hide();
+        this.widget_area = widget_area;
+        var widget_prompt = $('<div/>')
+            .addClass('prompt')
+            .appendTo(widget_area);
+        var widget_subarea = $('<div/>')
+            .addClass('widget-subarea')
+            .appendTo(widget_area);
+        this.widget_subarea = widget_subarea;
+        var that = this;
+        var widget_clear_buton = $('<button />')
+            .addClass('close')
+            .html('&times;')
+            .click(function() {
+                widget_area.slideUp('', function(){ 
+                    for (var i = 0; i < that.widget_views.length; i++) {
+                        var view = that.widget_views[i];
+                        view.remove();
+
+                        // Remove widget live events.
+                        view.off('comm:live', that._widget_live);
+                        view.off('comm:dead', that._widget_dead);
+                    }
+                    that.widget_views = [];
+                    widget_subarea.html(''); 
+                });
+            })
+            .appendTo(widget_prompt);
+
+
+    /**
+    *  Display a widget view in the cell.
+    */
+    CodeCell.prototype.display_widget_view = function(view_promise) {
+
+        // Display a dummy element
+        var dummy = $('<div/>');
+        this.widget_subarea.append(dummy);
+
+        // Display the view.
+        var that = this;
+        return view_promise.then(function(view) {
+            that.widget_area.show();
+            dummy.replaceWith(view.$el);
+            that.widget_views.push(view);
+
+            // Check the live state of the view's model.
+            if (view.model.comm_live) {
+                that._widget_live(view);
+            } else {
+                that._widget_dead(view);
+            }
+
+            // Listen to comm live events for the view.
+            view.on('comm:live', that._widget_live, that);
+            view.on('comm:dead', that._widget_dead, that);
+            return view;
+        });
+    };
+
+    /**
+     * Handles when a widget loses it's comm connection.
+     * @param  {WidgetView} view
+     */
+    CodeCell.prototype._widget_dead = function(view) {
+        if (this._widgets_live) {
+            this._widgets_live = false;
+            this.widget_area.addClass('connection-problems');
+        }
+
+    };
+
+    /**
+     * Handles when a widget is connected to a live comm.
+     * @param  {WidgetView} view
+     */
+    CodeCell.prototype._widget_live = function(view) {
+        if (!this._widgets_live) {
+            // Check that the other widgets are live too.  O(N) operation.
+            // Abort the function at the first dead widget found.
+            for (var i = 0; i < this.widget_views.length; i++) {
+                if (!this.widget_views[i].model.comm_live) return;
+            }
+            this._widgets_live = true;
+            this.widget_area.removeClass('connection-problems');
+        }
+    };
+
+
+// TODO: on event execute.CodeCell
+        // Clear widget area
+        for (var i = 0; i < this.widget_views.length; i++) {
+            var view = this.widget_views[i];
+            view.remove();
+
+            // Remove widget live events.
+            view.off('comm:live', this._widget_live);
+            view.off('comm:dead', this._widget_dead);
+        }
+        this.widget_views = [];
+        this.widget_subarea.html('');
+        this.widget_subarea.height('');
+        this.widget_area.height('');
+        this.widget_area.hide();
+        
\ No newline at end of file
diff --git a/jupyter_notebook/static/notebook/js/codecell.js b/jupyter_notebook/static/notebook/js/codecell.js
index 7577c366b0..0fb1fd9554 100644
--- a/jupyter_notebook/static/notebook/js/codecell.js
+++ b/jupyter_notebook/static/notebook/js/codecell.js
@@ -100,8 +100,6 @@ define([
 
         this.last_msg_id = null;
         this.completer = null;
-        this.widget_views = [];
-        this._widgets_live = true;
 
         Cell.apply(this,[{
             config: $.extend({}, CodeCell.options_default), 
@@ -176,39 +174,8 @@ define([
         inner_cell.append(input_area);
         input.append(prompt).append(inner_cell);
 
-        var widget_area = $('<div/>')
-            .addClass('widget-area')
-            .hide();
-        this.widget_area = widget_area;
-        var widget_prompt = $('<div/>')
-            .addClass('prompt')
-            .appendTo(widget_area);
-        var widget_subarea = $('<div/>')
-            .addClass('widget-subarea')
-            .appendTo(widget_area);
-        this.widget_subarea = widget_subarea;
-        var that = this;
-        var widget_clear_buton = $('<button />')
-            .addClass('close')
-            .html('&times;')
-            .click(function() {
-                widget_area.slideUp('', function(){ 
-                    for (var i = 0; i < that.widget_views.length; i++) {
-                        var view = that.widget_views[i];
-                        view.remove();
-
-                        // Remove widget live events.
-                        view.off('comm:live', that._widget_live);
-                        view.off('comm:dead', that._widget_dead);
-                    }
-                    that.widget_views = [];
-                    widget_subarea.html(''); 
-                });
-            })
-            .appendTo(widget_prompt);
-
         var output = $('<div></div>');
-        cell.append(input).append(widget_area).append(output);
+        cell.append(input).append(output);
         this.element = cell;
         this.output_area = new outputarea.OutputArea({
             selector: output, 
@@ -218,64 +185,6 @@ define([
         this.completer = new completer.Completer(this, this.events);
     };
 
-    /**
-    *  Display a widget view in the cell.
-    */
-    CodeCell.prototype.display_widget_view = function(view_promise) {
-
-        // Display a dummy element
-        var dummy = $('<div/>');
-        this.widget_subarea.append(dummy);
-
-        // Display the view.
-        var that = this;
-        return view_promise.then(function(view) {
-            that.widget_area.show();
-            dummy.replaceWith(view.$el);
-            that.widget_views.push(view);
-
-            // Check the live state of the view's model.
-            if (view.model.comm_live) {
-                that._widget_live(view);
-            } else {
-                that._widget_dead(view);
-            }
-
-            // Listen to comm live events for the view.
-            view.on('comm:live', that._widget_live, that);
-            view.on('comm:dead', that._widget_dead, that);
-            return view;
-        });
-    };
-
-    /**
-     * Handles when a widget loses it's comm connection.
-     * @param  {WidgetView} view
-     */
-    CodeCell.prototype._widget_dead = function(view) {
-        if (this._widgets_live) {
-            this._widgets_live = false;
-            this.widget_area.addClass('connection-problems');
-        }
-
-    };
-
-    /**
-     * Handles when a widget is connected to a live comm.
-     * @param  {WidgetView} view
-     */
-    CodeCell.prototype._widget_live = function(view) {
-        if (!this._widgets_live) {
-            // Check that the other widgets are live too.  O(N) operation.
-            // Abort the function at the first dead widget found.
-            for (var i = 0; i < this.widget_views.length; i++) {
-                if (!this.widget_views[i].model.comm_live) return;
-            }
-            this._widgets_live = true;
-            this.widget_area.removeClass('connection-problems');
-        }
-    };
-
     /** @method bind_events */
     CodeCell.prototype.bind_events = function () {
         Cell.prototype.bind_events.apply(this);
@@ -398,21 +307,6 @@ define([
             stop_on_error = true;
         }
 
-        // Clear widget area
-        for (var i = 0; i < this.widget_views.length; i++) {
-            var view = this.widget_views[i];
-            view.remove();
-
-            // Remove widget live events.
-            view.off('comm:live', this._widget_live);
-            view.off('comm:dead', this._widget_dead);
-        }
-        this.widget_views = [];
-        this.widget_subarea.html('');
-        this.widget_subarea.height('');
-        this.widget_area.height('');
-        this.widget_area.hide();
-        
         var old_msg_id = this.last_msg_id;
 
         if (old_msg_id) {

From 3c06df1c3bc0097b168ef9eaf865040356030506 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 17 Apr 2015 12:25:13 -0700
Subject: [PATCH 3/9] remove widget/kernel coupling code

---
 ipython_widgets/static/notebook/js/extension.js    | 11 +++++++++++
 jupyter_notebook/static/services/kernels/kernel.js |  6 ++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 ipython_widgets/static/notebook/js/extension.js

diff --git a/ipython_widgets/static/notebook/js/extension.js b/ipython_widgets/static/notebook/js/extension.js
new file mode 100644
index 0000000000..b4a9f42c20
--- /dev/null
+++ b/ipython_widgets/static/notebook/js/extension.js
@@ -0,0 +1,11 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+define([
+    'widgets/js/init'
+], function(widgetmanager) {
+    "use strict";
+    
+    // TODO
+    this.widget_manager = new widgetmanager.WidgetManager(this.comm_manager, notebook);
+});
diff --git a/jupyter_notebook/static/services/kernels/kernel.js b/jupyter_notebook/static/services/kernels/kernel.js
index 35dc06f37c..aaba95c8b2 100644
--- a/jupyter_notebook/static/services/kernels/kernel.js
+++ b/jupyter_notebook/static/services/kernels/kernel.js
@@ -6,9 +6,8 @@ define([
     'jquery',
     'base/js/utils',
     './comm',
-    './serialize',
-    'widgets/js/init'
-], function(IPython, $, utils, comm, serialize, widgetmanager) {
+    './serialize'
+], function(IPython, $, utils, comm, serialize) {
     "use strict";
 
     /**
@@ -55,7 +54,6 @@ define([
         this.bind_events();
         this.init_iopub_handlers();
         this.comm_manager = new comm.CommManager(this);
-        this.widget_manager = new widgetmanager.WidgetManager(this.comm_manager, notebook);
         
         this.last_msg_id = null;
         this.last_msg_callbacks = {};

From 47d9ee2430fe472ed1e5b5502060bed02a7a5019 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 17 Apr 2015 13:05:30 -0700
Subject: [PATCH 4/9] Fix double nesting of widget files.

---
 ipython_widgets/static/widgets/{widgets => }/js/init.js           | 0
 ipython_widgets/static/widgets/{widgets => }/js/manager.js        | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget.js         | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_bool.js    | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_box.js     | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_button.js  | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_float.js   | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_image.js   | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_int.js     | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_link.js    | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_output.js  | 0
 .../static/widgets/{widgets => }/js/widget_selection.js           | 0
 .../static/widgets/{widgets => }/js/widget_selectioncontainer.js  | 0
 ipython_widgets/static/widgets/{widgets => }/js/widget_string.js  | 0
 ipython_widgets/static/widgets/{widgets => }/less/widgets.less    | 0
 15 files changed, 0 insertions(+), 0 deletions(-)
 rename ipython_widgets/static/widgets/{widgets => }/js/init.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/manager.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_bool.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_box.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_button.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_float.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_image.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_int.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_link.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_output.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_selection.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_selectioncontainer.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/js/widget_string.js (100%)
 rename ipython_widgets/static/widgets/{widgets => }/less/widgets.less (100%)

diff --git a/ipython_widgets/static/widgets/widgets/js/init.js b/ipython_widgets/static/widgets/js/init.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/init.js
rename to ipython_widgets/static/widgets/js/init.js
diff --git a/ipython_widgets/static/widgets/widgets/js/manager.js b/ipython_widgets/static/widgets/js/manager.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/manager.js
rename to ipython_widgets/static/widgets/js/manager.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget.js b/ipython_widgets/static/widgets/js/widget.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget.js
rename to ipython_widgets/static/widgets/js/widget.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_bool.js b/ipython_widgets/static/widgets/js/widget_bool.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_bool.js
rename to ipython_widgets/static/widgets/js/widget_bool.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_box.js b/ipython_widgets/static/widgets/js/widget_box.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_box.js
rename to ipython_widgets/static/widgets/js/widget_box.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_button.js b/ipython_widgets/static/widgets/js/widget_button.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_button.js
rename to ipython_widgets/static/widgets/js/widget_button.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_float.js b/ipython_widgets/static/widgets/js/widget_float.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_float.js
rename to ipython_widgets/static/widgets/js/widget_float.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_image.js b/ipython_widgets/static/widgets/js/widget_image.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_image.js
rename to ipython_widgets/static/widgets/js/widget_image.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_int.js b/ipython_widgets/static/widgets/js/widget_int.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_int.js
rename to ipython_widgets/static/widgets/js/widget_int.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_link.js b/ipython_widgets/static/widgets/js/widget_link.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_link.js
rename to ipython_widgets/static/widgets/js/widget_link.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_output.js b/ipython_widgets/static/widgets/js/widget_output.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_output.js
rename to ipython_widgets/static/widgets/js/widget_output.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_selection.js b/ipython_widgets/static/widgets/js/widget_selection.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_selection.js
rename to ipython_widgets/static/widgets/js/widget_selection.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_selectioncontainer.js b/ipython_widgets/static/widgets/js/widget_selectioncontainer.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_selectioncontainer.js
rename to ipython_widgets/static/widgets/js/widget_selectioncontainer.js
diff --git a/ipython_widgets/static/widgets/widgets/js/widget_string.js b/ipython_widgets/static/widgets/js/widget_string.js
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/js/widget_string.js
rename to ipython_widgets/static/widgets/js/widget_string.js
diff --git a/ipython_widgets/static/widgets/widgets/less/widgets.less b/ipython_widgets/static/widgets/less/widgets.less
similarity index 100%
rename from ipython_widgets/static/widgets/widgets/less/widgets.less
rename to ipython_widgets/static/widgets/less/widgets.less

From b6d5158f672770778aa83ce8a5d70d1ec2cc9ab7 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 17 Apr 2015 13:14:04 -0700
Subject: [PATCH 5/9] Add init file.

---
 ipython_widgets/__init__.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ipython_widgets/__init__.py

diff --git a/ipython_widgets/__init__.py b/ipython_widgets/__init__.py
new file mode 100644
index 0000000000..982183cd1c
--- /dev/null
+++ b/ipython_widgets/__init__.py
@@ -0,0 +1 @@
+from .widgets import *

From a154ffa66eef7818fee4d9fb726d9a9549b3af4d Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Fri, 17 Apr 2015 13:14:31 -0700
Subject: [PATCH 6/9] Add static file handler

---
 ipython_widgets/widget_handler.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 ipython_widgets/widget_handler.py

diff --git a/ipython_widgets/widget_handler.py b/ipython_widgets/widget_handler.py
new file mode 100644
index 0000000000..47859a23d7
--- /dev/null
+++ b/ipython_widgets/widget_handler.py
@@ -0,0 +1,12 @@
+import os
+from IPython.html.utils import url_path_join as ujoin
+from tornado.web import StaticFileHandler
+
+module_path = os.path.dirname(__file__)
+def load_jupyter_server_extension(nbapp):
+    webapp = nbapp.web_app
+    base_url = webapp.settings['base_url']
+    webapp.add_handlers(".*$", [
+        (ujoin(base_url, r"/widgets/static/(.+)"), StaticFileHandler, 
+            {'path': os.path.join(module_path, 'static')}),
+    ])

From 6851d5c5eec28bab859e39f803dc7d5a0faca6f8 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 20 Apr 2015 12:49:38 -0700
Subject: [PATCH 7/9] :cake: It's working!

---
 ipython_widgets/install.py                    |  15 +++
 .../static/notebook/js/extension.js           |  63 +++++++++-
 .../static/notebook/js/widgetarea.js          | 117 ++++++++++++------
 ipython_widgets/static/widgets/js/init.js     |  26 ++--
 ipython_widgets/static/widgets/js/manager.js  |   6 +-
 ipython_widgets/static/widgets/js/widget.js   |   2 +-
 .../static/widgets/js/widget_bool.js          |   2 +-
 .../static/widgets/js/widget_box.js           |   2 +-
 .../static/widgets/js/widget_button.js        |   2 +-
 .../static/widgets/js/widget_float.js         |   4 +-
 .../static/widgets/js/widget_image.js         |   2 +-
 .../static/widgets/js/widget_int.js           |   2 +-
 .../static/widgets/js/widget_link.js          |   2 +-
 .../static/widgets/js/widget_output.js        |   2 +-
 .../static/widgets/js/widget_selection.js     |   2 +-
 .../widgets/js/widget_selectioncontainer.js   |   2 +-
 .../static/widgets/js/widget_string.js        |   2 +-
 ipython_widgets/widget_handler.py             |  12 --
 ipython_widgets/widgets/interaction.py        |   2 +-
 .../static/notebook/js/codecell.js            |   1 +
 .../static/services/kernels/kernel.js         |  10 +-
 .../static/services/sessions/session.js       |   2 +-
 22 files changed, 193 insertions(+), 87 deletions(-)
 create mode 100644 ipython_widgets/install.py
 delete mode 100644 ipython_widgets/widget_handler.py

diff --git a/ipython_widgets/install.py b/ipython_widgets/install.py
new file mode 100644
index 0000000000..6924074796
--- /dev/null
+++ b/ipython_widgets/install.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# Thanks @takluyver for your cite2c install.py.
+from os.path import dirname, abspath, join as pjoin
+from jupyter_notebook.nbextensions import install_nbextension
+from jupyter_notebook.services.config import ConfigManager
+
+print("Installing nbextension ...")
+staticdir = pjoin(dirname(abspath(__file__)), 'static')
+install_nbextension(staticdir, destination='widgets', user=False)
+
+print("Enabling the extension ...")
+cm = ConfigManager()
+cm.update('notebook', {"load_extensions": {"widgets/notebook/js/extension": True}})
+
+print("Done.")
diff --git a/ipython_widgets/static/notebook/js/extension.js b/ipython_widgets/static/notebook/js/extension.js
index b4a9f42c20..a929fc92fa 100644
--- a/ipython_widgets/static/notebook/js/extension.js
+++ b/ipython_widgets/static/notebook/js/extension.js
@@ -2,10 +2,65 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    'widgets/js/init'
-], function(widgetmanager) {
+    'nbextensions/widgets/widgets/js/init',
+    'nbextensions/widgets/notebook/js/widgetarea',
+    'base/js/events'
+], function(widgetmanager, widgetarea, events) {
     "use strict";
+
+    /**
+     * Create a widget manager for a kernel instance.
+     */
+    var handle_kernel = function(kernel) {
+        if (kernel.comm_manager && kernel.widget_manager === undefined) {
+            
+            // Create a widget manager instance.  Use the global
+            // IPython.notebook handle.
+            var manager = new widgetmanager.WidgetManager(kernel.comm_manager, IPython.notebook);
+
+            // Store a handle to the manager so we know not to
+            // another for this kernel.  This also is a convinience
+            // for the user.
+            kernel.widget_manager = manager;
+        }
+    };
+
+    // If a kernel already exists, create a widget manager.
+    if (IPython.notebook && IPython.notebook.kernel) {
+        handle_kernel(IPython.notebook.kernel);
+    }
+    // When the kernel is created, create a widget manager.
+    events.on('kernel_created.Kernel kernel_created.Session', function(event, data) {
+        handle_kernel(data.kernel);
+    });
+
+    /**
+     * Creates a widgetarea for the cell if it is a CodeCell.
+     * If the cell isn't a CodeCell, no action is taken.
+     */
+    var handle_cell = function(cell) {
+        if (cell.cell_type==='code') {
+            var area = new widgetarea.WidgetArea(cell);
+            cell.widgetarea = area;
+        }
+    };
+
+    // Create widget areas for cells that already exist.
+    var cells = IPython.notebook.get_cells();
+    for (var i = 0; i < cells.length; i++) {
+        handle_cell(cells[i]);
+    }
     
-    // TODO
-    this.widget_manager = new widgetmanager.WidgetManager(this.comm_manager, notebook);
+    // Listen to cell creation and deletion events.  When a
+    // cell is created, create a widget area for that cell.
+    events.on('create.Cell', function(event, data) {
+        handle_cell(data.cell);
+    });
+    // When a cell is deleted, delete the widget area if it
+    // exists.
+    events.on('delete.Cell', function(event, data) {
+        if (data.cell && data.cell.widgetarea) {
+            data.cell.widgetarea.dispose();
+        }
+    });
 });
diff --git a/ipython_widgets/static/notebook/js/widgetarea.js b/ipython_widgets/static/notebook/js/widgetarea.js
index 75b93ba2d4..b9fbaa3d06 100644
--- a/ipython_widgets/static/notebook/js/widgetarea.js
+++ b/ipython_widgets/static/notebook/js/widgetarea.js
@@ -1,12 +1,65 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
 
-// Events that this code should rely on.
-// delete.Cell
-// selected_cell_type_changed.Notebook
-// create.Cell
-
+define(['jquery', 'base/js/events'], function($, events) {
+    
+    /**
+     * WidgetArea
+     */
+    var WidgetArea = function(cell) {
         this.widget_views = [];
+
+        this._cell = cell;
         this._widgets_live = true;
+        this.disposed = false;
+
+        this._create_elements();
+        this._bind_events();
+    }
+
+    /**
+    *  Display a widget view in the cell.
+    */
+    WidgetArea.prototype.display_widget_view = function(view_promise) {
+
+        // Display a dummy element
+        var dummy = $('<div/>');
+        this.widget_subarea.append(dummy);
+
+        // Display the view.
+        var that = this;
+        return view_promise.then(function(view) {
+            that.widget_area.show();
+            dummy.replaceWith(view.$el);
+            that.widget_views.push(view);
+
+            // Check the live state of the view's model.
+            if (view.model.comm_live) {
+                that._widget_live(view);
+            } else {
+                that._widget_dead(view);
+            }
+
+            // Listen to comm live events for the view.
+            view.on('comm:live', that._widget_live, that);
+            view.on('comm:dead', that._widget_dead, that);
+            return view;
+        });
+    };
+
+    /**
+     * Disposes of the widget area and its widgets.
+     */
+    WidgetArea.prototype.dispose = function() {
+        this._clear();
+        this.disposed = true;
+    };
 
+    /**
+     * Creates the elements of the widget area and appends them
+     * to the associated cell.
+     */
+    WidgetArea.prototype._create_elements = function() {
         var widget_area = $('<div/>')
             .addClass('widget-area')
             .hide();
@@ -38,42 +91,30 @@
             })
             .appendTo(widget_prompt);
 
+        if (this._cell.input) {
+            this._cell.input.after(widget_area);
+        } else {
+            throw new Error('Cell does not have an `input` element.  Is it not a CodeCell?');
+        }
+    }
 
     /**
-    *  Display a widget view in the cell.
-    */
-    CodeCell.prototype.display_widget_view = function(view_promise) {
-
-        // Display a dummy element
-        var dummy = $('<div/>');
-        this.widget_subarea.append(dummy);
-
-        // Display the view.
+     * Listens to events of the cell.
+     */
+    WidgetArea.prototype._bind_events = function() {
         var that = this;
-        return view_promise.then(function(view) {
-            that.widget_area.show();
-            dummy.replaceWith(view.$el);
-            that.widget_views.push(view);
-
-            // Check the live state of the view's model.
-            if (view.model.comm_live) {
-                that._widget_live(view);
-            } else {
-                that._widget_dead(view);
+        events.on('execute.CodeCell', function(event, data) {
+            if (data.cell===that._cell) {
+                that._clear();
             }
-
-            // Listen to comm live events for the view.
-            view.on('comm:live', that._widget_live, that);
-            view.on('comm:dead', that._widget_dead, that);
-            return view;
         });
     };
 
     /**
      * Handles when a widget loses it's comm connection.
-     * @param  {WidgetView} view
+     * @param {WidgetView} view
      */
-    CodeCell.prototype._widget_dead = function(view) {
+    WidgetArea.prototype._widget_dead = function(view) {
         if (this._widgets_live) {
             this._widgets_live = false;
             this.widget_area.addClass('connection-problems');
@@ -83,9 +124,9 @@
 
     /**
      * Handles when a widget is connected to a live comm.
-     * @param  {WidgetView} view
+     * @param {WidgetView} view
      */
-    CodeCell.prototype._widget_live = function(view) {
+    WidgetArea.prototype._widget_live = function(view) {
         if (!this._widgets_live) {
             // Check that the other widgets are live too.  O(N) operation.
             // Abort the function at the first dead widget found.
@@ -97,8 +138,10 @@
         }
     };
 
-
-// TODO: on event execute.CodeCell
+    /**
+     * Clears the widgets in the widget area.
+     */
+    WidgetArea.prototype._clear = function() {
         // Clear widget area
         for (var i = 0; i < this.widget_views.length; i++) {
             var view = this.widget_views[i];
@@ -113,4 +156,8 @@
         this.widget_subarea.height('');
         this.widget_area.height('');
         this.widget_area.hide();
+    };
+
+    return {WidgetArea: WidgetArea};
+});
         
\ No newline at end of file
diff --git a/ipython_widgets/static/widgets/js/init.js b/ipython_widgets/static/widgets/js/init.js
index 45a3f2165a..b371115af2 100644
--- a/ipython_widgets/static/widgets/js/init.js
+++ b/ipython_widgets/static/widgets/js/init.js
@@ -2,19 +2,19 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/manager",
-    "widgets/js/widget",
-    "widgets/js/widget_link",
-    "widgets/js/widget_bool",
-    "widgets/js/widget_button",
-    "widgets/js/widget_box",
-    "widgets/js/widget_float",
-    "widgets/js/widget_image",
-    "widgets/js/widget_int",
-    "widgets/js/widget_output",
-    "widgets/js/widget_selection",
-    "widgets/js/widget_selectioncontainer",
-    "widgets/js/widget_string",
+    "nbextensions/widgets/widgets/js/manager",
+    "nbextensions/widgets/widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget_link",
+    "nbextensions/widgets/widgets/js/widget_bool",
+    "nbextensions/widgets/widgets/js/widget_button",
+    "nbextensions/widgets/widgets/js/widget_box",
+    "nbextensions/widgets/widgets/js/widget_float",
+    "nbextensions/widgets/widgets/js/widget_image",
+    "nbextensions/widgets/widgets/js/widget_int",
+    "nbextensions/widgets/widgets/js/widget_output",
+    "nbextensions/widgets/widgets/js/widget_selection",
+    "nbextensions/widgets/widgets/js/widget_selectioncontainer",
+    "nbextensions/widgets/widgets/js/widget_string",
 ], function(widgetmanager, widget) {
     // Register all of the loaded models and views with the widget manager.
     for (var i = 2; i < arguments.length; i++) {
diff --git a/ipython_widgets/static/widgets/js/manager.js b/ipython_widgets/static/widgets/js/manager.js
index ee927cb82e..81700c0a8a 100644
--- a/ipython_widgets/static/widgets/js/manager.js
+++ b/ipython_widgets/static/widgets/js/manager.js
@@ -140,9 +140,9 @@ define([
 
     WidgetManager.prototype.display_view_in_cell = function(cell, model) {
         // Displays a view in a cell.
-        if (cell.display_widget_view) {
+        if (cell.widgetarea) {
             var that = this;
-            return cell.display_widget_view(this.create_view(model, {
+            return cell.widgetarea.display_widget_view(this.create_view(model, {
                 cell: cell,
                 // Only set cell_index when view is displayed as directly.
                 cell_index: that.notebook.find_cell_index(cell),
@@ -152,7 +152,7 @@ define([
                 return view;
             }).catch(utils.reject('Could not create or display view', true)); 
         } else {
-            return Promise.reject(new Error('Cell does not have a `display_widget_view` method'));
+            return Promise.reject(new Error('Cell does not have a `widgetarea` defined'));
         }
     };
 
diff --git a/ipython_widgets/static/widgets/js/widget.js b/ipython_widgets/static/widgets/js/widget.js
index 2481fe89b9..3657746c97 100644
--- a/ipython_widgets/static/widgets/js/widget.js
+++ b/ipython_widgets/static/widgets/js/widget.js
@@ -1,7 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-define(["widgets/js/manager",
+define(["nbextensions/widgets/widgets/js/manager",
         "underscore",
         "backbone",
         "jquery",
diff --git a/ipython_widgets/static/widgets/js/widget_bool.js b/ipython_widgets/static/widgets/js/widget_bool.js
index c9749471ba..36ca9eff09 100644
--- a/ipython_widgets/static/widgets/js/widget_bool.js
+++ b/ipython_widgets/static/widgets/js/widget_bool.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jquery",
     "bootstrap",
 ], function(widget, $){
diff --git a/ipython_widgets/static/widgets/js/widget_box.js b/ipython_widgets/static/widgets/js/widget_box.js
index 0a374add26..8467b8cc4c 100644
--- a/ipython_widgets/static/widgets/js/widget_box.js
+++ b/ipython_widgets/static/widgets/js/widget_box.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jqueryui",
     "underscore",
     "base/js/utils",
diff --git a/ipython_widgets/static/widgets/js/widget_button.js b/ipython_widgets/static/widgets/js/widget_button.js
index 6dc85d19f1..e60e71f048 100644
--- a/ipython_widgets/static/widgets/js/widget_button.js
+++ b/ipython_widgets/static/widgets/js/widget_button.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jquery",
     "bootstrap",
 ], function(widget, $){
diff --git a/ipython_widgets/static/widgets/js/widget_float.js b/ipython_widgets/static/widgets/js/widget_float.js
index d3bc2cf329..c6523e4f02 100644
--- a/ipython_widgets/static/widgets/js/widget_float.js
+++ b/ipython_widgets/static/widgets/js/widget_float.js
@@ -2,8 +2,8 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
-    "widgets/js/widget_int",
+    "nbextensions/widgets/widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget_int",
 ], function(widget, int_widgets){
     var IntSliderView = int_widgets.IntSliderView;
     var IntTextView = int_widgets.IntTextView;
diff --git a/ipython_widgets/static/widgets/js/widget_image.js b/ipython_widgets/static/widgets/js/widget_image.js
index 263f75de9d..184c9500e6 100644
--- a/ipython_widgets/static/widgets/js/widget_image.js
+++ b/ipython_widgets/static/widgets/js/widget_image.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jquery",
 ], function(widget, $){
     
diff --git a/ipython_widgets/static/widgets/js/widget_int.js b/ipython_widgets/static/widgets/js/widget_int.js
index b693c42e2e..5aeca6c48e 100644
--- a/ipython_widgets/static/widgets/js/widget_int.js
+++ b/ipython_widgets/static/widgets/js/widget_int.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jqueryui",
     "base/js/keyboard",
     "bootstrap"
diff --git a/ipython_widgets/static/widgets/js/widget_link.js b/ipython_widgets/static/widgets/js/widget_link.js
index 03329bf38f..0ee7a09563 100644
--- a/ipython_widgets/static/widgets/js/widget_link.js
+++ b/ipython_widgets/static/widgets/js/widget_link.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jquery",
 ], function(widget, $){
     var LinkModel = widget.WidgetModel.extend({
diff --git a/ipython_widgets/static/widgets/js/widget_output.js b/ipython_widgets/static/widgets/js/widget_output.js
index 4fa235c40e..a055923db5 100644
--- a/ipython_widgets/static/widgets/js/widget_output.js
+++ b/ipython_widgets/static/widgets/js/widget_output.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jquery",
     'notebook/js/outputarea',
 ], function(widget, $, outputarea) {
diff --git a/ipython_widgets/static/widgets/js/widget_selection.js b/ipython_widgets/static/widgets/js/widget_selection.js
index 3077d4aa6d..46ea622b0b 100644
--- a/ipython_widgets/static/widgets/js/widget_selection.js
+++ b/ipython_widgets/static/widgets/js/widget_selection.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "base/js/utils",
     "jquery",
     "underscore",
diff --git a/ipython_widgets/static/widgets/js/widget_selectioncontainer.js b/ipython_widgets/static/widgets/js/widget_selectioncontainer.js
index 4cfc0e73bf..8dab5c610b 100644
--- a/ipython_widgets/static/widgets/js/widget_selectioncontainer.js
+++ b/ipython_widgets/static/widgets/js/widget_selectioncontainer.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "base/js/utils",
     "jquery",
     "bootstrap",
diff --git a/ipython_widgets/static/widgets/js/widget_string.js b/ipython_widgets/static/widgets/js/widget_string.js
index ac34889aed..6f62bc4cb4 100644
--- a/ipython_widgets/static/widgets/js/widget_string.js
+++ b/ipython_widgets/static/widgets/js/widget_string.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    "widgets/js/widget",
+    "nbextensions/widgets/widgets/js/widget",
     "jquery",
     "bootstrap",
 ], function(widget, $){
diff --git a/ipython_widgets/widget_handler.py b/ipython_widgets/widget_handler.py
deleted file mode 100644
index 47859a23d7..0000000000
--- a/ipython_widgets/widget_handler.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os
-from IPython.html.utils import url_path_join as ujoin
-from tornado.web import StaticFileHandler
-
-module_path = os.path.dirname(__file__)
-def load_jupyter_server_extension(nbapp):
-    webapp = nbapp.web_app
-    base_url = webapp.settings['base_url']
-    webapp.add_handlers(".*$", [
-        (ujoin(base_url, r"/widgets/static/(.+)"), StaticFileHandler, 
-            {'path': os.path.join(module_path, 'static')}),
-    ])
diff --git a/ipython_widgets/widgets/interaction.py b/ipython_widgets/widgets/interaction.py
index 4b7ddb4faa..88138b3a2e 100644
--- a/ipython_widgets/widgets/interaction.py
+++ b/ipython_widgets/widgets/interaction.py
@@ -12,7 +12,7 @@
 from inspect import getcallargs
 
 from IPython.core.getipython import get_ipython
-from jupyter_notebook.widgets import (Widget, Text,
+from . import (Widget, Text,
     FloatSlider, IntSlider, Checkbox, Dropdown,
     Box, Button, DOMWidget)
 from IPython.display import display, clear_output
diff --git a/jupyter_notebook/static/notebook/js/codecell.js b/jupyter_notebook/static/notebook/js/codecell.js
index 0fb1fd9554..6a34f8537b 100644
--- a/jupyter_notebook/static/notebook/js/codecell.js
+++ b/jupyter_notebook/static/notebook/js/codecell.js
@@ -154,6 +154,7 @@ define([
         cell.attr('tabindex','2');
 
         var input = $('<div></div>').addClass('input');
+        this.input = input;
         var prompt = $('<div/>').addClass('prompt input_prompt');
         var inner_cell = $('<div/>').addClass('inner_cell');
         this.celltoolbar = new celltoolbar.CellToolbar({
diff --git a/jupyter_notebook/static/services/kernels/kernel.js b/jupyter_notebook/static/services/kernels/kernel.js
index aaba95c8b2..52279849b5 100644
--- a/jupyter_notebook/static/services/kernels/kernel.js
+++ b/jupyter_notebook/static/services/kernels/kernel.js
@@ -6,8 +6,9 @@ define([
     'jquery',
     'base/js/utils',
     './comm',
-    './serialize'
-], function(IPython, $, utils, comm, serialize) {
+    './serialize',
+    'base/js/events'
+], function(IPython, $, utils, comm, serialize, events) {
     "use strict";
 
     /**
@@ -19,11 +20,10 @@ define([
      * @class Kernel
      * @param {string} kernel_service_url - the URL to access the kernel REST api
      * @param {string} ws_url - the websockets URL
-     * @param {Notebook} notebook - notebook object
      * @param {string} name - the kernel type (e.g. python3)
      */
-    var Kernel = function (kernel_service_url, ws_url, notebook, name) {
-        this.events = notebook.events;
+    var Kernel = function (kernel_service_url, ws_url, name) {
+        this.events = events;
 
         this.id = null;
         this.name = name;
diff --git a/jupyter_notebook/static/services/sessions/session.js b/jupyter_notebook/static/services/sessions/session.js
index ac79f33e9f..923558df6e 100644
--- a/jupyter_notebook/static/services/sessions/session.js
+++ b/jupyter_notebook/static/services/sessions/session.js
@@ -101,7 +101,7 @@ define([
                 that.kernel.name = that.kernel_model.name;
             } else {
                 var kernel_service_url = utils.url_path_join(that.base_url, "api/kernels");
-                that.kernel = new kernel.Kernel(kernel_service_url, that.ws_url, that.notebook, that.kernel_model.name);
+                that.kernel = new kernel.Kernel(kernel_service_url, that.ws_url, that.kernel_model.name);
             }
             that.events.trigger('kernel_created.Session', {session: that, kernel: that.kernel});
             that.kernel._kernel_created(data.kernel);

From 07e9be33ce46cd46cb0640d3db44b6fa5447e141 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Mon, 20 Apr 2015 13:11:02 -0700
Subject: [PATCH 8/9] :cake: Added a widget JS deprecation warning!

This is a combination of 9 commits.

Shim IPython.html.widgets
Add flags to widgets install.
Put shim in IPython instead
Add deprecation warning to Javascript source
Move tests
Don't use setting to pass log arround.
Simplify deprecated handler.
Use requirejs to perform redirect.
---
 ipython_widgets/install.py                         |  8 +++++++-
 .../widgets => ipython_widgets/tests}/manager.js   |  0
 .../widgets => ipython_widgets/tests}/widget.js    |  0
 .../tests}/widget_bool.js                          |  0
 .../tests}/widget_box.js                           |  0
 .../tests}/widget_button.js                        |  0
 .../tests}/widget_float.js                         |  0
 .../tests}/widget_image.js                         |  0
 .../tests}/widget_int.js                           |  0
 .../tests}/widget_selection.js                     |  0
 .../tests}/widget_selectioncontainer.js            |  0
 .../tests}/widget_string.js                        |  0
 jupyter_notebook/notebookapp.py                    | 14 +++++++++++++-
 jupyter_notebook/templates/page.html               |  1 +
 14 files changed, 21 insertions(+), 2 deletions(-)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/manager.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_bool.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_box.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_button.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_float.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_image.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_int.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_selection.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_selectioncontainer.js (100%)
 rename {jupyter_notebook/tests/widgets => ipython_widgets/tests}/widget_string.js (100%)

diff --git a/ipython_widgets/install.py b/ipython_widgets/install.py
index 6924074796..093e8ad62e 100644
--- a/ipython_widgets/install.py
+++ b/ipython_widgets/install.py
@@ -3,10 +3,16 @@
 from os.path import dirname, abspath, join as pjoin
 from jupyter_notebook.nbextensions import install_nbextension
 from jupyter_notebook.services.config import ConfigManager
+import argparse
+
+parser = argparse.ArgumentParser(description="Installs the IPython widgets")
+parser.add_argument("-u", "--user", help="Install as current user", action="store_true")
+parser.add_argument("-s", "--symlink", help="Symlink instead of copying files", action="store_true")
+args = parser.parse_args()
 
 print("Installing nbextension ...")
 staticdir = pjoin(dirname(abspath(__file__)), 'static')
-install_nbextension(staticdir, destination='widgets', user=False)
+install_nbextension(staticdir, destination='widgets', user=args.user, symlink=args.symlink)
 
 print("Enabling the extension ...")
 cm = ConfigManager()
diff --git a/jupyter_notebook/tests/widgets/manager.js b/ipython_widgets/tests/manager.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/manager.js
rename to ipython_widgets/tests/manager.js
diff --git a/jupyter_notebook/tests/widgets/widget.js b/ipython_widgets/tests/widget.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget.js
rename to ipython_widgets/tests/widget.js
diff --git a/jupyter_notebook/tests/widgets/widget_bool.js b/ipython_widgets/tests/widget_bool.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_bool.js
rename to ipython_widgets/tests/widget_bool.js
diff --git a/jupyter_notebook/tests/widgets/widget_box.js b/ipython_widgets/tests/widget_box.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_box.js
rename to ipython_widgets/tests/widget_box.js
diff --git a/jupyter_notebook/tests/widgets/widget_button.js b/ipython_widgets/tests/widget_button.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_button.js
rename to ipython_widgets/tests/widget_button.js
diff --git a/jupyter_notebook/tests/widgets/widget_float.js b/ipython_widgets/tests/widget_float.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_float.js
rename to ipython_widgets/tests/widget_float.js
diff --git a/jupyter_notebook/tests/widgets/widget_image.js b/ipython_widgets/tests/widget_image.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_image.js
rename to ipython_widgets/tests/widget_image.js
diff --git a/jupyter_notebook/tests/widgets/widget_int.js b/ipython_widgets/tests/widget_int.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_int.js
rename to ipython_widgets/tests/widget_int.js
diff --git a/jupyter_notebook/tests/widgets/widget_selection.js b/ipython_widgets/tests/widget_selection.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_selection.js
rename to ipython_widgets/tests/widget_selection.js
diff --git a/jupyter_notebook/tests/widgets/widget_selectioncontainer.js b/ipython_widgets/tests/widget_selectioncontainer.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_selectioncontainer.js
rename to ipython_widgets/tests/widget_selectioncontainer.js
diff --git a/jupyter_notebook/tests/widgets/widget_string.js b/ipython_widgets/tests/widget_string.js
similarity index 100%
rename from jupyter_notebook/tests/widgets/widget_string.js
rename to ipython_widgets/tests/widget_string.js
diff --git a/jupyter_notebook/notebookapp.py b/jupyter_notebook/notebookapp.py
index ce8cff26b3..a64d62bfbe 100644
--- a/jupyter_notebook/notebookapp.py
+++ b/jupyter_notebook/notebookapp.py
@@ -64,7 +64,7 @@
 
 from .auth.login import LoginHandler
 from .auth.logout import LogoutHandler
-from .base.handlers import FileFindHandler
+from .base.handlers import FileFindHandler, IPythonHandler
 
 from traitlets.config import Config
 from traitlets.config.application import catch_config_error, boolean_flag
@@ -120,6 +120,16 @@ def load_handlers(name):
     mod = __import__(name, fromlist=['default_handlers'])
     return mod.default_handlers
 
+
+class DeprecationHandler(IPythonHandler):
+    def get(self, url_path):
+        self.set_header("Content-Type", 'text/javascript')
+        self.finish("""
+            console.warn('`/static/widgets/js` is deprecated.  Use `/nbextensions/widgets/widgets/js` instead.');
+            define(['%s'], function(x) { return x; });
+        """ % url_path_join('nbextensions', 'widgets', 'widgets', url_path.rstrip('.js')))
+        self.log.warn('Deprecated widget Javascript path /static/widgets/js/*.js was used')
+
 #-----------------------------------------------------------------------------
 # The Tornado web application
 #-----------------------------------------------------------------------------
@@ -214,6 +224,7 @@ def init_handlers(self, settings):
         
         # Order matters. The first handler to match the URL will handle the request.
         handlers = []
+        handlers.append((r'/deprecatedwidgets/(.*)', DeprecationHandler))
         handlers.extend(load_handlers('tree.handlers'))
         handlers.extend([(r"/login", settings['login_handler_class'])])
         handlers.extend([(r"/logout", settings['logout_handler_class'])])
@@ -251,6 +262,7 @@ def init_handlers(self, settings):
                 'permanent': False, # want 302, not 301
             })
         )
+
         # prepend base_url onto the patterns that we match
         new_handlers = []
         for handler in handlers:
diff --git a/jupyter_notebook/templates/page.html b/jupyter_notebook/templates/page.html
index 3ccef6dde3..3baea59101 100644
--- a/jupyter_notebook/templates/page.html
+++ b/jupyter_notebook/templates/page.html
@@ -25,6 +25,7 @@
           paths: {
             custom : '{{ base_url }}custom',
             nbextensions : '{{ base_url }}nbextensions',
+            widgets : '{{ base_url }}deprecatedwidgets',
             kernelspecs : '{{ base_url }}kernelspecs',
             underscore : 'components/underscore/underscore-min',
             backbone : 'components/backbone/backbone-min',

From 31d50662e59316b5221b11ff598fa28334ca8bb3 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 21 Apr 2015 14:13:31 -0700
Subject: [PATCH 9/9] Remove reference to widget less.

---
 jupyter_notebook/static/notebook/less/style_noapp.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jupyter_notebook/static/notebook/less/style_noapp.less b/jupyter_notebook/static/notebook/less/style_noapp.less
index fa233ab57f..f450328aac 100644
--- a/jupyter_notebook/static/notebook/less/style_noapp.less
+++ b/jupyter_notebook/static/notebook/less/style_noapp.less
@@ -12,4 +12,3 @@
 @import "outputarea.less";
 @import "renderedhtml.less";
 @import "textcell.less";
-@import "../../widgets/less/widgets.less";