Updated widget examples for recent changes and,

renames from earlier PRs
jupyter-widgets · Aug 28, 2014 · 4c36449 · 4c36449
1 parent 94f760d
commit 4c36449
Show file tree

Hide file tree

Showing 11 changed files with 11,313 additions and 901 deletions.
diff --git a/examples/Interactive Widgets/Custom Widget - Hello World.ipynb b/examples/Interactive Widgets/Custom Widget - Hello World.ipynb
@@ -1,8 +1,17 @@
 {
  "metadata": {
  "celltoolbar": "Slideshow",
+ "kernelspec": {
+ "codemirror_mode": {
+ "name": "python",
+ "version": 2
+ },
+ "display_name": "Python 2",
+ "language": "python",
+ "name": "python2"
+ },
  "name": "",
- "signature": "sha256:32ada55b57f8674a38435bae581b0f53caefd829dca5c5a7931ab3d04a7d86bb"
+ "signature": "sha256:ebbb9b368e8b07ec14fd5ee494586e605be36631657f2a9d9a6475ead41a3e04"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -240,16 +249,15 @@
  "cell_type": "markdown",
  "metadata": {},
  "source": [
- "You first need to **import the WidgetManager**. You will use it later to register your view by name (the same name you used in the back-end). To import the widget manager, use the `require` method of [require.js](http://requirejs.org/) (as seen below)."
+ "You first need to **import the `widget` and `manager` modules**. You will use it later to register your view by name (the same name you used in the back-end). To import the modules, use the `require` method of [require.js](http://requirejs.org/) (as seen below)."
  ]
  },
  {
  "cell_type": "code",
  "collapsed": false,
  "input": [
  "%%javascript\n",
- "\n",
- "require([\"widgets/js/widget\"], function(WidgetManager){\n",
+ "require([\"widgets/js/widget\", \"widgets/js/manager\"], function(widget, manager){\n",
  " \n",
  "});"
  ],
@@ -281,16 +289,15 @@
  "collapsed": false,
  "input": [
  "%%javascript\n",
- "\n",
- "require([\"widgets/js/widget\"], function(WidgetManager){\n",
+ "require([\"widgets/js/widget\", \"widgets/js/manager\"], function(widget, manager){\n",
  " \n",
  " // Define the HelloView\n",
- " var HelloView = IPython.DOMWidgetView.extend({\n",
+ " var HelloView = widget.DOMWidgetView.extend({\n",
  " \n",
  " });\n",
  " \n",
  " // Register the HelloView with the widget manager.\n",
- " WidgetManager.register_widget_view('HelloView', HelloView);\n",
+ " manager.WidgetManager.register_widget_view('HelloView', HelloView);\n",
  "});"
  ],
  "language": "python",
@@ -321,18 +328,17 @@
  "collapsed": false,
  "input": [
  "%%javascript\n",
- "\n",
- "require([\"widgets/js/widget\"], function(WidgetManager){ \n",
+ "require([\"widgets/js/widget\", \"widgets/js/manager\"], function(widget, manager){\n",
  " \n",
- " var HelloView = IPython.DOMWidgetView.extend({\n",
+ " var HelloView = widget.DOMWidgetView.extend({\n",
  " \n",
  " // Render the view.\n",
  " render: function(){ \n",
  " this.$el.text('Hello World!'); \n",
  " },\n",
  " });\n",
  " \n",
- " WidgetManager.register_widget_view('HelloView', HelloView);\n",
+ " manager.WidgetManager.register_widget_view('HelloView', HelloView);\n",
  "});"
  ],
  "language": "python",
@@ -442,17 +448,16 @@
  "collapsed": false,
  "input": [
  "%%javascript\n",
- "\n",
- "require([\"widgets/js/widget\"], function(WidgetManager){ \n",
+ "require([\"widgets/js/widget\", \"widgets/js/manager\"], function(widget, manager){\n",
  " \n",
- " var HelloView = IPython.DOMWidgetView.extend({\n",
+ " var HelloView = widget.DOMWidgetView.extend({\n",
  " \n",
  " render: function(){ \n",
  " this.$el.text(this.model.get('value')); \n",
  " },\n",
  " });\n",
  " \n",
- " WidgetManager.register_widget_view('HelloView', HelloView);\n",
+ " manager.WidgetManager.register_widget_view('HelloView', HelloView);\n",
  "});"
  ],
  "language": "python",
@@ -483,11 +488,9 @@
  "collapsed": false,
  "input": [
  "%%javascript\n",
- "\n",
- "require([\"widgets/js/widget\"], function(WidgetManager){ \n",
+ "require([\"widgets/js/widget\", \"widgets/js/manager\"], function(widget, manager){\n",
  " \n",
- " var HelloView = IPython.DOMWidgetView.extend({\n",
- " \n",
+ " var HelloView = widget.DOMWidgetView.extend({\n",
  " \n",
  " render: function(){ \n",
  " this.value_changed();\n",
@@ -499,7 +502,7 @@
  " },\n",
  " });\n",
  " \n",
- " WidgetManager.register_widget_view('HelloView', HelloView);\n",
+ " manager.WidgetManager.register_widget_view('HelloView', HelloView);\n",
  "});"
  ],
  "language": "python",
@@ -622,10 +625,9 @@
  "collapsed": false,
  "input": [
  "%%javascript\n",
- "\n",
- "require([\"widgets/js/widget\"], function(WidgetManager){ \n",
+ "require([\"widgets/js/widget\", \"widgets/js/manager\"], function(widget, manager){\n",
  " \n",
- " var SpinnerView = IPython.DOMWidgetView.extend({\n",
+ " var SpinnerView = widget.DOMWidgetView.extend({\n",
  " \n",
  " render: function(){ \n",
  " \n",
@@ -645,7 +647,7 @@
  " },\n",
  " });\n",
  " \n",
- " WidgetManager.register_widget_view('SpinnerView', SpinnerView);\n",
+ " manager.WidgetManager.register_widget_view('SpinnerView', SpinnerView);\n",
  "});"
  ],
  "language": "python",
@@ -676,10 +678,9 @@
  "collapsed": false,
  "input": [
  "%%javascript\n",
- "\n",
- "require([\"widgets/js/widget\"], function(WidgetManager){ \n",
+ "require([\"widgets/js/widget\", \"widgets/js/manager\"], function(widget, manager){\n",
  " \n",
- " var SpinnerView = IPython.DOMWidgetView.extend({\n",
+ " var SpinnerView = widget.DOMWidgetView.extend({\n",
  " \n",
  " render: function(){ \n",
  "\n",
@@ -709,7 +710,7 @@
  " },\n",
  " });\n",
  " \n",
- " WidgetManager.register_widget_view('SpinnerView', SpinnerView);\n",
+ " manager.WidgetManager.register_widget_view('SpinnerView', SpinnerView);\n",
  "});"
  ],
  "language": "python",
@@ -772,7 +773,7 @@
  "input": [
  "from IPython.display import display\n",
  "w1 = SpinnerWidget(value=0)\n",
- "w2 = widgets.IntSliderWidget()\n",
+ "w2 = widgets.IntSlider()\n",
  "display(w1,w2)\n",
  "\n",
  "from IPython.utils.traitlets import link\n",