From 046280b51a92bfdaded462bc429f44fb808d00a7 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Tue, 21 Jan 2014 17:09:49 -0800
Subject: [PATCH] s/ModalView/PopupView

---
 .../html/static/notebook/js/widgets/widget_container.js   | 8 ++++----
 IPython/html/widgets/__init__.py                          | 2 +-
 IPython/html/widgets/widget_container.py                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/IPython/html/static/notebook/js/widgets/widget_container.js b/IPython/html/static/notebook/js/widgets/widget_container.js
index af8e1b2d3..1b3acb50c 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 6f026bae3..f845752a9 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 adc1c98c7..80a92919b 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)