From 10a84acc7843ef894cb05169b31c61c2ab7ce348 2014-01-16 10:57:17 From: Jonathan Frederic Date: 2014-01-16 10:57:17 Subject: [PATCH] Finished renaming Multicontainer to SelectionContainer --- diff --git a/IPython/html/static/notebook/js/widgets/init.js b/IPython/html/static/notebook/js/widgets/init.js index 2e606ec..f47d20b 100644 --- a/IPython/html/static/notebook/js/widgets/init.js +++ b/IPython/html/static/notebook/js/widgets/init.js @@ -342,8 +342,8 @@ define([ "notebook/js/widgets/widget_image", "notebook/js/widgets/widget_int", "notebook/js/widgets/widget_int_range", - "notebook/js/widgets/widget_multicontainer", "notebook/js/widgets/widget_selection", + "notebook/js/widgets/widget_selectioncontainer", "notebook/js/widgets/widget_string", ], function(){ return true; }); >>>>>>> renamed: basic_widgets.js -> init.js diff --git a/IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js b/IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js index 1e2870c..3bab276 100644 --- a/IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js +++ b/IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js @@ -6,7 +6,7 @@ //---------------------------------------------------------------------------- //============================================================================ -// MultiContainerWidget +// SelectionContainerWidget //============================================================================ /** @@ -15,8 +15,8 @@ **/ define(["notebook/js/widgets/widget"], function(widget_manager){ - var MulticontainerModel = IPython.WidgetModel.extend({}); - widget_manager.register_widget_model('MulticontainerWidgetModel', MulticontainerModel); + var SelectionContainerModel = IPython.WidgetModel.extend({}); + widget_manager.register_widget_model('SelectionContainerWidgetModel', SelectionContainerModel); var AccordionView = IPython.DOMWidgetView.extend({ diff --git a/IPython/html/widgets/__init__.py b/IPython/html/widgets/__init__.py index 6354735..69b5dee 100644 --- a/IPython/html/widgets/__init__.py +++ b/IPython/html/widgets/__init__.py @@ -8,6 +8,6 @@ from .widget_float_range import FloatRangeWidget from .widget_image import ImageWidget from .widget_int import IntWidget from .widget_int_range import IntRangeWidget -from .widget_multicontainer import MulticontainerWidget from .widget_selection import SelectionWidget +from .widget_selectioncontainer import SelectionContainerWidget from .widget_string import StringWidget diff --git a/IPython/html/widgets/widget_selectioncontainer.py b/IPython/html/widgets/widget_selectioncontainer.py index 02b9527..efb0ba8 100644 --- a/IPython/html/widgets/widget_selectioncontainer.py +++ b/IPython/html/widgets/widget_selectioncontainer.py @@ -1,4 +1,4 @@ -"""MulticontainerWidget class. +"""SelectionContainerWidget class. Represents a multipage container that can be used to group other widgets into pages. @@ -20,8 +20,8 @@ from IPython.utils.traitlets import Unicode, Dict, Int, List, Instance #----------------------------------------------------------------------------- # Classes #----------------------------------------------------------------------------- -class MulticontainerWidget(DOMWidget): - target_name = Unicode('MulticontainerWidgetModel') +class SelectionContainerWidget(DOMWidget): + target_name = Unicode('SelectionContainerWidgetModel') view_name = Unicode('TabView') # Keys