diff --git a/IPython/html/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js index f8b997053..e4e6d3da4 100644 --- a/IPython/html/static/notebook/js/main.js +++ b/IPython/html/static/notebook/js/main.js @@ -14,7 +14,7 @@ // which make both this file fail at setting marked configuration, and textcell.js // which search marked into global. require(['components/marked/lib/marked', - 'notebook/js/widgets/init'], + 'widgets/js/init'], function (marked) { "use strict"; diff --git a/IPython/html/static/notebook/js/widgets/init.js b/IPython/html/static/widgets/js/init.js similarity index 59% rename from IPython/html/static/notebook/js/widgets/init.js rename to IPython/html/static/widgets/js/init.js index 9d3148d35..4c23488b8 100644 --- a/IPython/html/static/notebook/js/widgets/init.js +++ b/IPython/html/static/widgets/js/init.js @@ -10,13 +10,13 @@ //============================================================================ define([ - "notebook/js/widgets/widget_bool", - "notebook/js/widgets/widget_button", - "notebook/js/widgets/widget_container", - "notebook/js/widgets/widget_float", - "notebook/js/widgets/widget_image", - "notebook/js/widgets/widget_int", - "notebook/js/widgets/widget_selection", - "notebook/js/widgets/widget_selectioncontainer", - "notebook/js/widgets/widget_string", + "widgets/js/widget_bool", + "widgets/js/widget_button", + "widgets/js/widget_container", + "widgets/js/widget_float", + "widgets/js/widget_image", + "widgets/js/widget_int", + "widgets/js/widget_selection", + "widgets/js/widget_selectioncontainer", + "widgets/js/widget_string", ], function(){ return true; }); diff --git a/IPython/html/static/notebook/js/widgetmanager.js b/IPython/html/static/widgets/js/manager.js similarity index 100% rename from IPython/html/static/notebook/js/widgetmanager.js rename to IPython/html/static/widgets/js/manager.js diff --git a/IPython/html/static/notebook/js/widgets/widget.js b/IPython/html/static/widgets/js/widget.js similarity index 99% rename from IPython/html/static/notebook/js/widgets/widget.js rename to IPython/html/static/widgets/js/widget.js index 27180c827..110b06ccc 100644 --- a/IPython/html/static/notebook/js/widgets/widget.js +++ b/IPython/html/static/widgets/js/widget.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgetmanager", +define(["widgets/js/manager", "underscore", "backbone"], function(WidgetManager, _, Backbone){ diff --git a/IPython/html/static/notebook/js/widgets/widget_bool.js b/IPython/html/static/widgets/js/widget_bool.js similarity index 98% rename from IPython/html/static/notebook/js/widgets/widget_bool.js rename to IPython/html/static/widgets/js/widget_bool.js index 6acbe7693..2f4669ce8 100644 --- a/IPython/html/static/notebook/js/widgets/widget_bool.js +++ b/IPython/html/static/widgets/js/widget_bool.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager){ +define(["widgets/js/widget"], function(WidgetManager){ var CheckboxView = IPython.DOMWidgetView.extend({ render : function(){ diff --git a/IPython/html/static/notebook/js/widgets/widget_button.js b/IPython/html/static/widgets/js/widget_button.js similarity index 96% rename from IPython/html/static/notebook/js/widgets/widget_button.js rename to IPython/html/static/widgets/js/widget_button.js index eb3c317a8..36a20e8aa 100644 --- a/IPython/html/static/notebook/js/widgets/widget_button.js +++ b/IPython/html/static/widgets/js/widget_button.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager){ +define(["widgets/js/widget"], function(WidgetManager){ var ButtonView = IPython.DOMWidgetView.extend({ render : function(){ diff --git a/IPython/html/static/notebook/js/widgets/widget_container.js b/IPython/html/static/widgets/js/widget_container.js similarity index 99% rename from IPython/html/static/notebook/js/widgets/widget_container.js rename to IPython/html/static/widgets/js/widget_container.js index e6d51f6a8..6fcbaca84 100644 --- a/IPython/html/static/notebook/js/widgets/widget_container.js +++ b/IPython/html/static/widgets/js/widget_container.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager) { +define(["widgets/js/widget"], function(WidgetManager) { var ContainerView = IPython.DOMWidgetView.extend({ render: function(){ diff --git a/IPython/html/static/notebook/js/widgets/widget_float.js b/IPython/html/static/widgets/js/widget_float.js similarity index 94% rename from IPython/html/static/notebook/js/widgets/widget_float.js rename to IPython/html/static/widgets/js/widget_float.js index fe85e0c35..36c2a81a7 100644 --- a/IPython/html/static/notebook/js/widgets/widget_float.js +++ b/IPython/html/static/widgets/js/widget_float.js @@ -14,8 +14,8 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget", - "notebook/js/widgets/widget_int"], +define(["widgets/js/widget", + "widgets/js/widget_int"], function(WidgetManager, int_widgets){ var IntSliderView = int_widgets[0]; diff --git a/IPython/html/static/notebook/js/widgets/widget_image.js b/IPython/html/static/widgets/js/widget_image.js similarity index 96% rename from IPython/html/static/notebook/js/widgets/widget_image.js rename to IPython/html/static/widgets/js/widget_image.js index 26162d641..c62e18c87 100644 --- a/IPython/html/static/notebook/js/widgets/widget_image.js +++ b/IPython/html/static/widgets/js/widget_image.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager){ +define(["widgets/js/widget"], function(WidgetManager){ var ImageView = IPython.DOMWidgetView.extend({ render : function(){ diff --git a/IPython/html/static/notebook/js/widgets/widget_int.js b/IPython/html/static/widgets/js/widget_int.js similarity index 99% rename from IPython/html/static/notebook/js/widgets/widget_int.js rename to IPython/html/static/widgets/js/widget_int.js index 2eb7069e8..693ac1621 100644 --- a/IPython/html/static/notebook/js/widgets/widget_int.js +++ b/IPython/html/static/widgets/js/widget_int.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager){ +define(["widgets/js/widget"], function(WidgetManager){ var IntSliderView = IPython.DOMWidgetView.extend({ render : function(){ diff --git a/IPython/html/static/notebook/js/widgets/widget_selection.js b/IPython/html/static/widgets/js/widget_selection.js similarity index 99% rename from IPython/html/static/notebook/js/widgets/widget_selection.js rename to IPython/html/static/widgets/js/widget_selection.js index 60a4dbcae..d6d4f046b 100644 --- a/IPython/html/static/notebook/js/widgets/widget_selection.js +++ b/IPython/html/static/widgets/js/widget_selection.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager){ +define(["widgets/js/widget"], function(WidgetManager){ var DropdownView = IPython.DOMWidgetView.extend({ render : function(){ diff --git a/IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js b/IPython/html/static/widgets/js/widget_selectioncontainer.js similarity index 99% rename from IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js rename to IPython/html/static/widgets/js/widget_selectioncontainer.js index ee33811cb..12cd9ccff 100644 --- a/IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js +++ b/IPython/html/static/widgets/js/widget_selectioncontainer.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager){ +define(["widgets/js/widget"], function(WidgetManager){ var AccordionView = IPython.DOMWidgetView.extend({ render: function(){ diff --git a/IPython/html/static/notebook/js/widgets/widget_string.js b/IPython/html/static/widgets/js/widget_string.js similarity index 99% rename from IPython/html/static/notebook/js/widgets/widget_string.js rename to IPython/html/static/widgets/js/widget_string.js index 92bfc997e..d5dd9ebcd 100644 --- a/IPython/html/static/notebook/js/widgets/widget_string.js +++ b/IPython/html/static/widgets/js/widget_string.js @@ -14,7 +14,7 @@ * @namespace IPython **/ -define(["notebook/js/widgets/widget"], function(WidgetManager){ +define(["widgets/js/widget"], function(WidgetManager){ var HTMLView = IPython.DOMWidgetView.extend({ render : function(){ diff --git a/IPython/html/static/notebook/less/widgets.less b/IPython/html/static/widgets/less/widgets.less similarity index 100% rename from IPython/html/static/notebook/less/widgets.less rename to IPython/html/static/widgets/less/widgets.less