diff --git a/IPython/html/static/notebook/js/widgets/widget_container.js b/IPython/html/static/notebook/js/widgets/widget_container.js index af8e1b2..1b3acb5 100644 --- a/IPython/html/static/notebook/js/widgets/widget_container.js +++ b/IPython/html/static/notebook/js/widgets/widget_container.js @@ -60,7 +60,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) { WidgetManager.register_widget_view('ContainerView', ContainerView); - var ModalView = IPython.DOMWidgetView.extend({ + var PopupView = IPython.DOMWidgetView.extend({ render: function(){ // Called when view is rendered. var that = this; @@ -244,7 +244,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) { this.show(); } - return ModalView.__super__.update.apply(this); + return PopupView.__super__.update.apply(this); }, _get_selector_element: function(selector) { @@ -264,9 +264,9 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) { return this.$window.find(selector.substring(6)); } } else { - return ModalView.__super__._get_selector_element.apply(this, [selector]); + return PopupView.__super__._get_selector_element.apply(this, [selector]); } }, }); - WidgetManager.register_widget_view('ModalView', ModalView); + WidgetManager.register_widget_view('PopupView', PopupView); }); diff --git a/IPython/html/widgets/__init__.py b/IPython/html/widgets/__init__.py index 6f026ba..f845752 100644 --- a/IPython/html/widgets/__init__.py +++ b/IPython/html/widgets/__init__.py @@ -2,7 +2,7 @@ from .widget import Widget, DOMWidget from .widget_bool import CheckBoxWidget, ToggleButtonWidget from .widget_button import ButtonWidget -from .widget_container import ContainerWidget, ModalWidget +from .widget_container import ContainerWidget, PopupWidget from .widget_float import FloatTextWidget, BoundedFloatTextWidget, FloatSliderWidget, FloatProgressWidget from .widget_image import ImageWidget from .widget_int import IntTextWidget, BoundedIntTextWidget, IntSliderWidget, IntProgressWidget diff --git a/IPython/html/widgets/widget_container.py b/IPython/html/widgets/widget_container.py index adc1c98..80a9291 100644 --- a/IPython/html/widgets/widget_container.py +++ b/IPython/html/widgets/widget_container.py @@ -45,8 +45,8 @@ class ContainerWidget(DOMWidget): self._children = children -class ModalWidget(ContainerWidget): - view_name = Unicode('ModalView', sync=True) +class PopupWidget(ContainerWidget): + view_name = Unicode('PopupView', sync=True) description = Unicode(sync=True) button_text = Unicode(sync=True)