Remove init_widget_js, use require.js for everything

Updated examples
Fixed bug with message throttling

IPython/html/static/notebook/js/main.js

@@ -14,7 +14,8 b''
 // as injecting require.js make marked not to put itself in the globals,
 // which make both this file fail at setting marked configuration, and textcell.js
 // which search marked into global.
-require(['components/marked/lib/marked'],
+require(['components/marked/lib/marked',
+         'notebook/js/widgets/basic_widgets'],
 
 function (marked) {
 

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

@@ -1295,11 +1295,13 b' var IPython = (function (IPython) {'
 
 
     /**
-     * Once a session is started, link the code cells to the kernel
+     * Once a session is started, link the code cells to the kernel and pass the 
+     * comm manager to the widget manager
      *
      */
     Notebook.prototype._session_started = function(){
         this.kernel = this.session.kernel;
+        IPython.widget_manager.attach_comm_manager(this.kernel.comm_manager);
         var ncells = this.ncells();
         for (var i=0; i<ncells; i++) {
             var cell = this.get_cell(i);

IPython/html/static/notebook/js/widget.js

@@ -24,8 +24,6 b' define(["components/underscore/underscore-min",'
          "components/backbone/backbone-min",
         ], function(){
 
-    // Only run once on a notebook.
-    if (IPython.notebook.widget_manager == undefined) {
 
         //--------------------------------------------------------------------
         // WidgetModel class
@@ -73,8 +71,8 b' define(["components/underscore/underscore-min",'
                     
                     // Send buffer if this message caused another message to be
                     // throttled.
-                    if (this.msg_buffer != null) {
-                        if (this.msg_throttle == this.pending_msgs && 
+                if (this.msg_buffer != null &&
+                    this.msg_throttle == this.pending_msgs && 
                             this.msg_buffer.length > 0) {
                             
                             var output_area = this._get_msg_output_area(msg);
@@ -89,7 +87,6 b' define(["components/underscore/underscore-min",'
                             --this.pending_msgs;
                         }
                     }
-                }
             },
 
 
@@ -421,8 +418,8 b' define(["components/underscore/underscore-min",'
         //--------------------------------------------------------------------
         // WidgetManager class
         //--------------------------------------------------------------------
-        var WidgetManager = function(comm_manager){
-            this.comm_manager = comm_manager;
+    var WidgetManager = function(){
+        this.comm_manager = null;
             this.widget_model_types = {};
             this.widget_view_types = {};
             
@@ -436,10 +433,22 b' define(["components/underscore/underscore-min",'
         }
 
 
+    WidgetManager.prototype.attach_comm_manager = function (comm_manager) {
+        this.comm_manager = comm_manager;
+
+        // Register already register widget model types with the comm manager.
+        for (var widget_model_name in this.widget_model_types) {
+            this.comm_manager.register_target(widget_model_name, $.proxy(this.handle_com_open, this));
+        }
+    }
+
+
         WidgetManager.prototype.register_widget_model = function (widget_model_name, widget_model_type) {
             // Register the widget with the comm manager.  Make sure to pass this object's context
             // in so `this` works in the call back.
+        if (this.comm_manager!=null) {
             this.comm_manager.register_target(widget_model_name, $.proxy(this.handle_com_open, this));
+        }
             this.widget_model_types[widget_model_name] = widget_model_type;
         }
 
@@ -462,7 +471,6 b' define(["components/underscore/underscore-min",'
         IPython.WidgetModel = WidgetModel;
         IPython.WidgetView = WidgetView;
 
-        IPython.notebook.widget_manager = new WidgetManager(IPython.notebook.kernel.comm_manager);    
+    IPython.widget_manager = new WidgetManager();
 
-    };
 });

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

@@ -1,8 +1,8 b''
 
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     
     var BoolWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('BoolWidgetModel', BoolWidgetModel);
+    IPython.widget_manager.register_widget_model('BoolWidgetModel', BoolWidgetModel);
 
     var CheckboxView = IPython.WidgetView.extend({
       
@@ -51,7 +51,7 b' require(["notebook/js/widget"], function(){'
         
     });
 
-    IPython.notebook.widget_manager.register_widget_view('CheckboxView', CheckboxView);
+    IPython.widget_manager.register_widget_view('CheckboxView', CheckboxView);
 
     var ToggleButtonView = IPython.WidgetView.extend({
       
@@ -104,6 +104,6 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('ToggleButtonView', ToggleButtonView);
+    IPython.widget_manager.register_widget_view('ToggleButtonView', ToggleButtonView);
 
 });

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

@@ -1,8 +1,8 b''
 
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     
     var ButtonWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('ButtonWidgetModel', ButtonWidgetModel);
+    IPython.widget_manager.register_widget_model('ButtonWidgetModel', ButtonWidgetModel);
 
     var ButtonView = IPython.WidgetView.extend({
       
@@ -34,6 +34,6 b' require(["notebook/js/widget"], function(){'
         
     });
 
-    IPython.notebook.widget_manager.register_widget_view('ButtonView', ButtonView);
+    IPython.widget_manager.register_widget_view('ButtonView', ButtonView);
 
 });

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

@@ -1,6 +1,6 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var ContainerModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('ContainerWidgetModel', ContainerModel);
+    IPython.widget_manager.register_widget_model('ContainerWidgetModel', ContainerModel);
 
     var ContainerView = IPython.WidgetView.extend({
         
@@ -42,5 +42,5 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('ContainerView', ContainerView);
+    IPython.widget_manager.register_widget_view('ContainerView', ContainerView);
 });
  No newline at end of file

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

@@ -1,4 +1,4 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var FloatWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('FloatWidgetModel', FloatWidgetModel);
+    IPython.widget_manager.register_widget_model('FloatWidgetModel', FloatWidgetModel);
 });
  No newline at end of file

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

@@ -1,6 +1,6 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var FloatRangeWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('FloatRangeWidgetModel', FloatRangeWidgetModel);
+    IPython.widget_manager.register_widget_model('FloatRangeWidgetModel', FloatRangeWidgetModel);
 
     var FloatSliderView = IPython.WidgetView.extend({
         
@@ -97,7 +97,7 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('FloatSliderView', FloatSliderView);
+    IPython.widget_manager.register_widget_view('FloatSliderView', FloatSliderView);
 
 
     var FloatTextView = IPython.WidgetView.extend({
@@ -188,7 +188,7 b' require(["notebook/js/widget"], function(){'
         }
     });
 
-    IPython.notebook.widget_manager.register_widget_view('FloatTextView', FloatTextView);
+    IPython.widget_manager.register_widget_view('FloatTextView', FloatTextView);
 
 
     var ProgressView = IPython.WidgetView.extend({
@@ -235,5 +235,5 b' require(["notebook/js/widget"], function(){'
         
     });
 
-    IPython.notebook.widget_manager.register_widget_view('ProgressView', ProgressView);
+    IPython.widget_manager.register_widget_view('ProgressView', ProgressView);
 });

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

@@ -1,4 +1,4 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var IntWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('IntWidgetModel', IntWidgetModel);
+    IPython.widget_manager.register_widget_model('IntWidgetModel', IntWidgetModel);
 });
  No newline at end of file

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

@@ -1,6 +1,6 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var IntRangeWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('IntRangeWidgetModel', IntRangeWidgetModel);
+    IPython.widget_manager.register_widget_model('IntRangeWidgetModel', IntRangeWidgetModel);
 
     var IntSliderView = IPython.WidgetView.extend({
         
@@ -97,7 +97,7 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('IntSliderView', IntSliderView);
+    IPython.widget_manager.register_widget_view('IntSliderView', IntSliderView);
 
     var IntTextView = IPython.WidgetView.extend({
         
@@ -187,5 +187,5 b' require(["notebook/js/widget"], function(){'
         }
     });
 
-    IPython.notebook.widget_manager.register_widget_view('IntTextView', IntTextView);
+    IPython.widget_manager.register_widget_view('IntTextView', IntTextView);
 });

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

@@ -1,6 +1,6 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var MulticontainerModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('MulticontainerWidgetModel', MulticontainerModel);
+    IPython.widget_manager.register_widget_model('MulticontainerWidgetModel', MulticontainerModel);
 
     var AccordionView = IPython.WidgetView.extend({
         
@@ -57,7 +57,7 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('AccordionView', AccordionView);
+    IPython.widget_manager.register_widget_view('AccordionView', AccordionView);
     
     var TabView = IPython.WidgetView.extend({
         
@@ -134,6 +134,6 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('TabView', TabView);
+    IPython.widget_manager.register_widget_view('TabView', TabView);
 
 });

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

@@ -1,6 +1,6 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var SelectionWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('SelectionWidgetModel', SelectionWidgetModel);
+    IPython.widget_manager.register_widget_model('SelectionWidgetModel', SelectionWidgetModel);
 
     var DropdownView = IPython.WidgetView.extend({
         
@@ -80,7 +80,7 b' require(["notebook/js/widget"], function(){'
         
     });
 
-    IPython.notebook.widget_manager.register_widget_view('DropdownView', DropdownView);
+    IPython.widget_manager.register_widget_view('DropdownView', DropdownView);
 
     var RadioButtonsView = IPython.WidgetView.extend({
         
@@ -165,7 +165,7 b' require(["notebook/js/widget"], function(){'
         
     });
 
-    IPython.notebook.widget_manager.register_widget_view('RadioButtonsView', RadioButtonsView);
+    IPython.widget_manager.register_widget_view('RadioButtonsView', RadioButtonsView);
 
 
     var ToggleButtonsView = IPython.WidgetView.extend({
@@ -247,5 +247,5 b' require(["notebook/js/widget"], function(){'
         
     });
 
-    IPython.notebook.widget_manager.register_widget_view('ToggleButtonsView', ToggleButtonsView);
+    IPython.widget_manager.register_widget_view('ToggleButtonsView', ToggleButtonsView);
 });

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

@@ -1,6 +1,6 b''
-require(["notebook/js/widget"], function(){
+define(["notebook/js/widget"], function(){
     var StringWidgetModel = IPython.WidgetModel.extend({});
-    IPython.notebook.widget_manager.register_widget_model('StringWidgetModel', StringWidgetModel);
+    IPython.widget_manager.register_widget_model('StringWidgetModel', StringWidgetModel);
 
     var LabelView = IPython.WidgetView.extend({
       
@@ -19,7 +19,7 b' require(["notebook/js/widget"], function(){'
         
     });
 
-    IPython.notebook.widget_manager.register_widget_view('LabelView', LabelView);
+    IPython.widget_manager.register_widget_view('LabelView', LabelView);
 
     var TextAreaView = IPython.WidgetView.extend({
       
@@ -73,7 +73,7 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('TextAreaView', TextAreaView);
+    IPython.widget_manager.register_widget_view('TextAreaView', TextAreaView);
 
     var TextBoxView = IPython.WidgetView.extend({
       
@@ -127,5 +127,5 b' require(["notebook/js/widget"], function(){'
         },
     });
 
-    IPython.notebook.widget_manager.register_widget_view('TextBoxView', TextBoxView);
+    IPython.widget_manager.register_widget_view('TextBoxView', TextBoxView);
 });

IPython/html/widgets/__init__.py

@@ -1,4 +1,4 b''
-from .widget import Widget, init_widget_js
+from .widget import Widget
 
 from .widget_bool import BoolWidget
 from .widget_button import ButtonWidget

IPython/html/widgets/widget.py

@@ -26,19 +26,6 b' from IPython.utils.traitlets import Unicode, Dict, List, Instance, Bool'
 from IPython.display import Javascript, display
 from IPython.utils.py3compat import string_types
 
-#-----------------------------------------------------------------------------
-# Shared
-#-----------------------------------------------------------------------------
-def init_widget_js():
-    path = os.path.split(os.path.abspath( __file__ ))[0]
-    for filepath in glob(os.path.join(path, "*.py")):
-        filename = os.path.split(filepath)[1]
-        name = filename.rsplit('.', 1)[0]
-        if not (name == 'widget' or name == '__init__') and name.startswith('widget_'):
-            # Remove 'widget_' from the start of the name before compiling the path.
-            js_path = 'static/notebook/js/widgets/%s.js' % name[7:]
-            display(Javascript(data='$.getScript($("body").data("baseProjectUrl") + "%s");' % js_path), exclude="text/plain")  
-
 
 #-----------------------------------------------------------------------------
 # Classes

examples/widgets/File Upload Widget.ipynb

@@ -18,85 +18,11 b''
      "collapsed": false,
      "input": [
       "from IPython.html import widgets # Widget definitions\n",
-      "from IPython.display import display # Used to display widgets in the notebook\n",
-      "\n",
-      "# Enable widgets in this notebook\n",
-      "widgets.init_widget_js()"
+      "from IPython.display import display # Used to display widgets in the notebook"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/button.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/int_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/string.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/multicontainer.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/bool.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/int.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/selection.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/float.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/float_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/container.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      }
-     ],
+     "outputs": [],
      "prompt_number": 1
     },
     {
@@ -141,7 +67,7 b''
       "    \n",
       "    // Define the FileModel and register it with the widget manager.\n",
       "    var FileModel = IPython.WidgetModel.extend({});\n",
-      "    IPython.notebook.widget_manager.register_widget_model('FileWidgetModel', FileModel);\n",
+      "    IPython.widget_manager.register_widget_model('FileWidgetModel', FileModel);\n",
       "    \n",
       "    // Define the FilePickerView\n",
       "    var FilePickerView = IPython.WidgetView.extend({\n",
@@ -176,7 +102,7 b''
       "    });\n",
       "        \n",
       "    // Register the DatePickerView with the widget manager.\n",
-      "    IPython.notebook.widget_manager.register_widget_view('FilePickerView', FilePickerView);\n",
+      "    IPython.widget_manager.register_widget_view('FilePickerView', FilePickerView);\n",
       "});"
      ],
      "language": "python",
@@ -189,7 +115,7 b''
         "    \n",
         "    // Define the FileModel and register it with the widget manager.\n",
         "    var FileModel = IPython.WidgetModel.extend({});\n",
-        "    IPython.notebook.widget_manager.register_widget_model('FileWidgetModel', FileModel);\n",
+        "    IPython.widget_manager.register_widget_model('FileWidgetModel', FileModel);\n",
         "    \n",
         "    // Define the FilePickerView\n",
         "    var FilePickerView = IPython.WidgetView.extend({\n",
@@ -202,7 +128,6 b''
         "        },\n",
         "        \n",
         "        // Handles: User input\n",
-        "        events: { \"change\" : \"handleFileChange\" }, \n",
         "        handleFileChange: function(evt) { \n",
         "            \n",
         "            //Retrieve the first (and only!) File from the FileList object\n",
@@ -225,13 +150,13 b''
         "    });\n",
         "        \n",
         "    // Register the DatePickerView with the widget manager.\n",
-        "    IPython.notebook.widget_manager.register_widget_view('FilePickerView', FilePickerView);\n",
+        "    IPython.widget_manager.register_widget_view('FilePickerView', FilePickerView);\n",
         "});"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x2fa80d0>"
+        "<IPython.core.display.Javascript at 0x319fe90>"
        ]
       }
      ],

examples/widgets/Part 1 - Basics.ipynb

@@ -1,5 +1,11 b''
 {
  "metadata": {
+  "cell_tags": [
+   [
+    "<None>",
+    null
+   ]
+  ],
   "name": ""
  },
  "nbformat": 3,
@@ -11,7 +17,7 b''
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "To enable the use IPython widgets in the notebook, the widget namespace and display function need to be imported.  The Javascript dependencies need to be loaded via `IPython.html.widgets.init_widget_js()`.  This method needs to be called each time the notebook webpage is refreshed."
+      "To use IPython widgets in the notebook, the widget namespace and display function need to be imported."
      ]
     },
     {
@@ -19,85 +25,11 b''
      "collapsed": false,
      "input": [
       "from IPython.html import widgets # Widget definitions\n",
-      "from IPython.display import display # Used to display widgets in the notebook\n",
-      "\n",
-      "# Enable widgets in this notebook\n",
-      "widgets.init_widget_js()"
+      "from IPython.display import display # Used to display widgets in the notebook"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/bool.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/int_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/int.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/selection.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/string.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/float.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/container.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/multicontainer.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/button.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/float_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      }
-     ],
+     "outputs": [],
      "prompt_number": 1
     },
     {

examples/widgets/Part 2 - Events.ipynb

@@ -1,5 +1,11 b''
 {
  "metadata": {
+  "cell_tags": [
+   [
+    "<None>",
+    null
+   ]
+  ],
   "name": ""
  },
  "nbformat": 3,
@@ -12,85 +18,11 b''
      "collapsed": false,
      "input": [
       "from IPython.html import widgets # Widget definitions\n",
-      "from IPython.display import display # Used to display widgets in the notebook\n",
-      "\n",
-      "# Enable widgets in this notebook\n",
-      "widgets.init_widget_js()"
+      "from IPython.display import display # Used to display widgets in the notebook"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/bool.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/int_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/int.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/selection.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/string.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/float.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/container.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/multicontainer.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/button.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/float_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      }
-     ],
+     "outputs": [],
      "prompt_number": 1
     },
     {

examples/widgets/Part 3 - Placement.ipynb

@@ -1,5 +1,11 b''
 {
  "metadata": {
+  "cell_tags": [
+   [
+    "<None>",
+    null
+   ]
+  ],
   "name": ""
  },
  "nbformat": 3,
@@ -12,85 +18,11 b''
      "collapsed": false,
      "input": [
       "from IPython.html import widgets # Widget definitions\n",
-      "from IPython.display import display # Used to display widgets in the notebook\n",
-      "\n",
-      "# Enable widgets in this notebook\n",
-      "widgets.init_widget_js()"
+      "from IPython.display import display # Used to display widgets in the notebook"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/bool.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/int_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/int.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/selection.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/string.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/float.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/container.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/multicontainer.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/button.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"/static/notebook/js/widgets/float_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      }
-     ],
+     "outputs": [],
      "prompt_number": 1
     },
     {

examples/widgets/Part 4 - Styles.ipynb

@@ -1,5 +1,11 b''
 {
  "metadata": {
+  "cell_tags": [
+   [
+    "<None>",
+    null
+   ]
+  ],
   "name": ""
  },
  "nbformat": 3,
@@ -12,85 +18,11 b''
      "collapsed": false,
      "input": [
       "from IPython.html import widgets # Widget definitions\n",
-      "from IPython.display import display # Used to display widgets in the notebook\n",
-      "\n",
-      "# Enable widgets in this notebook\n",
-      "widgets.init_widget_js()"
+      "from IPython.display import display # Used to display widgets in the notebook"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/bool.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/int_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/int.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/selection.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/string.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/float.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/container.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/multicontainer.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/button.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript(\"../static/notebook/js/widgets/float_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      }
-     ],
+     "outputs": [],
      "prompt_number": 1
     },
     {

examples/widgets/Part 5 - Alignment.ipynb

@@ -18,85 +18,11 b''
      "collapsed": false,
      "input": [
       "from IPython.html import widgets # Widget definitions\n",
-      "from IPython.display import display # Used to display widgets in the notebook\n",
-      "\n",
-      "# Enable widgets in this notebook\n",
-      "widgets.init_widget_js()"
+      "from IPython.display import display # Used to display widgets in the notebook"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/button.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/int_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/string.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/multicontainer.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/bool.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/int.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/selection.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/float.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/float_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/container.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      }
-     ],
+     "outputs": [],
      "prompt_number": 1
     },
     {

examples/widgets/Part 6 - Custom Widget.ipynb

@@ -30,85 +30,11 b''
      "collapsed": false,
      "input": [
       "from IPython.html import widgets # Widget definitions\n",
-      "from IPython.display import display # Used to display widgets in the notebook\n",
-      "\n",
-      "# Enable widgets in this notebook\n",
-      "widgets.init_widget_js()"
+      "from IPython.display import display # Used to display widgets in the notebook"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/button.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/int_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/string.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/multicontainer.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/bool.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/int.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/selection.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/float.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/float_range.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      },
-      {
-       "javascript": [
-        "$.getScript($(\"body\").data(\"baseProjectUrl\") + \"static/notebook/js/widgets/container.js\");"
-       ],
-       "metadata": {},
-       "output_type": "display_data"
-      }
-     ],
+     "outputs": [],
      "prompt_number": 1
     },
     {
@@ -213,7 +139,7 b''
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x168b0d0>"
+        "<IPython.core.display.Javascript at 0x21f8f10>"
        ]
       }
      ],
@@ -236,7 +162,7 b''
       "    \n",
       "    // Define the DateModel and register it with the widget manager.\n",
       "    var DateModel = IPython.WidgetModel.extend({});\n",
-      "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+      "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
       "});"
      ],
      "language": "python",
@@ -249,13 +175,13 b''
         "    \n",
         "    // Define the DateModel and register it with the widget manager.\n",
         "    var DateModel = IPython.WidgetModel.extend({});\n",
-        "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+        "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
         "});"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x168df50>"
+        "<IPython.core.display.Javascript at 0x21f8ed0>"
        ]
       }
      ],
@@ -280,7 +206,7 b''
       "    \n",
       "    // Define the DateModel and register it with the widget manager.\n",
       "    var DateModel = IPython.WidgetModel.extend({});\n",
-      "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+      "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -292,7 +218,7 b''
       "    });\n",
       "    \n",
       "    // Register the DatePickerView with the widget manager.\n",
-      "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+      "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
       "});"
      ],
      "language": "python",
@@ -305,7 +231,7 b''
         "    \n",
         "    // Define the DateModel and register it with the widget manager.\n",
         "    var DateModel = IPython.WidgetModel.extend({});\n",
-        "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+        "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -317,13 +243,13 b''
         "    });\n",
         "    \n",
         "    // Register the DatePickerView with the widget manager.\n",
-        "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+        "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
         "});"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x168f050>"
+        "<IPython.core.display.Javascript at 0x21f8cd0>"
        ]
       }
      ],
@@ -426,7 +352,7 b''
       "    \n",
       "    // Define the DateModel and register it with the widget manager.\n",
       "    var DateModel = IPython.WidgetModel.extend({});\n",
-      "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+      "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -443,7 +369,7 b''
       "    });\n",
       "    \n",
       "    // Register the DatePickerView with the widget manager.\n",
-      "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+      "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
       "});"
      ],
      "language": "python",
@@ -456,7 +382,7 b''
         "    \n",
         "    // Define the DateModel and register it with the widget manager.\n",
         "    var DateModel = IPython.WidgetModel.extend({});\n",
-        "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+        "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -473,13 +399,13 b''
         "    });\n",
         "    \n",
         "    // Register the DatePickerView with the widget manager.\n",
-        "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+        "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
         "});"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x17822d0>"
+        "<IPython.core.display.Javascript at 0x21fc310>"
        ]
       }
      ],
@@ -502,7 +428,7 b''
       "    \n",
       "    // Define the DateModel and register it with the widget manager.\n",
       "    var DateModel = IPython.WidgetModel.extend({});\n",
-      "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+      "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -526,7 +452,7 b''
       "    });\n",
       "    \n",
       "    // Register the DatePickerView with the widget manager.\n",
-      "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+      "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
       "});"
      ],
      "language": "python",
@@ -539,7 +465,7 b''
         "    \n",
         "    // Define the DateModel and register it with the widget manager.\n",
         "    var DateModel = IPython.WidgetModel.extend({});\n",
-        "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+        "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -563,13 +489,13 b''
         "    });\n",
         "    \n",
         "    // Register the DatePickerView with the widget manager.\n",
-        "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+        "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
         "});"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x1782390>"
+        "<IPython.core.display.Javascript at 0x21fc290>"
        ]
       }
      ],
@@ -596,7 +522,7 b''
       "    \n",
       "    // Define the DateModel and register it with the widget manager.\n",
       "    var DateModel = IPython.WidgetModel.extend({});\n",
-      "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+      "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -632,7 +558,7 b''
       "    });\n",
       "    \n",
       "    // Register the DatePickerView with the widget manager.\n",
-      "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+      "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
       "});"
      ],
      "language": "python",
@@ -645,7 +571,7 b''
         "    \n",
         "    // Define the DateModel and register it with the widget manager.\n",
         "    var DateModel = IPython.WidgetModel.extend({});\n",
-        "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+        "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -681,13 +607,13 b''
         "    });\n",
         "    \n",
         "    // Register the DatePickerView with the widget manager.\n",
-        "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+        "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
         "});"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x17821d0>"
+        "<IPython.core.display.Javascript at 0x21fc3d0>"
        ]
       }
      ],
@@ -759,7 +685,7 b''
        "output_type": "pyout",
        "prompt_number": 13,
        "text": [
-        "u''"
+        "u'2013-11-14'"
        ]
       }
      ],
@@ -1041,7 +967,7 b''
       "    \n",
       "    // Define the DateModel and register it with the widget manager.\n",
       "    var DateModel = IPython.WidgetModel.extend({});\n",
-      "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+      "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -1095,7 +1021,7 b''
       "    });\n",
       "    \n",
       "    // Register the DatePickerView with the widget manager.\n",
-      "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+      "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
       "});"
      ],
      "language": "python",
@@ -1108,7 +1034,7 b''
         "    \n",
         "    // Define the DateModel and register it with the widget manager.\n",
         "    var DateModel = IPython.WidgetModel.extend({});\n",
-        "    IPython.notebook.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
+        "    IPython.widget_manager.register_widget_model('DateWidgetModel', DateModel);\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.WidgetView.extend({\n",
@@ -1162,13 +1088,13 b''
         "    });\n",
         "    \n",
         "    // Register the DatePickerView with the widget manager.\n",
-        "    IPython.notebook.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
+        "    IPython.widget_manager.register_widget_view('DatePickerView', DatePickerView);\n",
         "});"
        ],
        "metadata": {},
        "output_type": "display_data",
        "text": [
-        "<IPython.core.display.Javascript at 0x179f790>"
+        "<IPython.core.display.Javascript at 0x221a850>"
        ]
       }
      ],
@@ -1216,7 +1142,6 b''
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "\n",
       "display(my_widget, view_name=\"TextBoxView\")"
      ],
      "language": "python",