Merge pull request #5289 from ellisonbg/widget-path

Finishing up #5274 (widget paths fixes)
ipython · Mar 7, 2014 · 3f608e3 · 3f608e3
2 parents b668b92 + 1410f91
commit 3f608e3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/examples/widgets/File Upload Widget.ipynb b/examples/widgets/File Upload Widget.ipynb
@@ -78,7 +78,7 @@
      "input": [
       "%%javascript\n",
       "\n",
-      "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+      "require([\"widgets/js/widget\"], function(WidgetManager){\n",
       "\n",
       "    var FilePickerView = IPython.WidgetView.extend({\n",
       "        render: function(){\n",
@@ -130,7 +130,7 @@
       {
        "javascript": [
         "\n",
-        "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+        "require([\"widgets/js/widget\"], function(WidgetManager){\n",
         "\n",
         "    var FilePickerView = IPython.WidgetView.extend({\n",
         "        render: function(){\n",
@@ -245,4 +245,4 @@
    "metadata": {}
   }
  ]
-}
+}
diff --git a/examples/widgets/Part 6 - Custom Widget.ipynb b/examples/widgets/Part 6 - Custom Widget.ipynb
@@ -120,7 +120,7 @@
      "metadata": {},
      "source": [
       "In the IPython notebook [require.js](http://requirejs.org/) is used to load JavaScript dependencies.\n",
-      "All IPython widget code depends on `notebook/js/widgets/widget.js`,\n",
+      "All IPython widget code depends on `widgets/js/widget.js`,\n",
       "where the base widget model and base view are defined.\n",
       "We use require.js to load this file:"
      ]
@@ -131,7 +131,7 @@
      "input": [
       "%%javascript\n",
       "\n",
-      "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+      "require([\"widgets/js/widget\"], function(WidgetManager){\n",
       "\n",
       "});"
      ],
@@ -141,7 +141,7 @@
       {
        "javascript": [
         "\n",
-        "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+        "require([\"widgets/js/widget\"], function(WidgetManager){\n",
         "\n",
         "});"
        ],
@@ -174,7 +174,7 @@
      "input": [
       "%%javascript\n",
       "\n",
-      "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+      "require([\"widgets/js/widget\"], function(WidgetManager){\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -191,7 +191,7 @@
       {
        "javascript": [
         "\n",
-        "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+        "require([\"widgets/js/widget\"], function(WidgetManager){\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -301,7 +301,7 @@
      "input": [
       "%%javascript\n",
       "\n",
-      "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+      "require([\"widgets/js/widget\"], function(WidgetManager){\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -324,7 +324,7 @@
       {
        "javascript": [
         "\n",
-        "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+        "require([\"widgets/js/widget\"], function(WidgetManager){\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -363,7 +363,7 @@
      "input": [
       "%%javascript\n",
       "\n",
-      "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+      "require([\"widgets/js/widget\"], function(WidgetManager){\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -393,7 +393,7 @@
       {
        "javascript": [
         "\n",
-        "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+        "require([\"widgets/js/widget\"], function(WidgetManager){\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -446,7 +446,7 @@
       "%%javascript\n",
       "\n",
       "\n",
-      "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+      "require([\"widgets/js/widget\"], function(WidgetManager){\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -486,7 +486,7 @@
        "javascript": [
         "\n",
         "\n",
-        "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+        "require([\"widgets/js/widget\"], function(WidgetManager){\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -830,7 +830,7 @@
      "input": [
       "%%javascript\n",
       "\n",
-      "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+      "require([\"widgets/js/widget\"], function(WidgetManager){\n",
       "    \n",
       "    // Define the DatePickerView\n",
       "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -886,7 +886,7 @@
       {
        "javascript": [
         "\n",
-        "require([\"notebook/js/widgets/widget\"], function(WidgetManager){\n",
+        "require([\"widgets/js/widget\"], function(WidgetManager){\n",
         "    \n",
         "    // Define the DatePickerView\n",
         "    var DatePickerView = IPython.DOMWidgetView.extend({\n",
@@ -1055,4 +1055,4 @@
    "metadata": {}
   }
  ]
-}
+}