containers and selectioncontainers now only allow one of any single child

IPython/html/widgets/widget_container.py

@@ -1,34 +1,52 b''
 """ContainerWidget class.  
 
 Represents a container that can be used to group other widgets.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
 from IPython.utils.traitlets import Unicode, Bool, List, Instance
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class ContainerWidget(DOMWidget):
     view_name = Unicode('ContainerView', sync=True)
 
     # Keys, all private and managed by helper methods.  Flexible box model
     # classes...
-    children = List(Instance(DOMWidget), sync=True)
+    children = List(Instance(DOMWidget))
+    _children = List(Instance(DOMWidget), sync=True)
     
-    description = Unicode(sync=True)
-    button_text = Unicode(sync=True)
+    def __init__(self, *pargs, **kwargs):
+        """Constructor"""
+        DOMWidget.__init__(self, *pargs, **kwargs)
+        self.on_trait_change(self._validate, ['children'])
+
+    def _validate(self, name, old, new):
+        """Validate children list.
+
+        Makes sure only one instance of any given model can exist in the 
+        children list."""
+        if new is not None and isinstance(new, list):
+            children = []
+            for child in new:
+                if child not in children:
+                    children.append(child)
+            self._children = children
 
 
 class ModalWidget(ContainerWidget):
     view_name = Unicode('ModalView', sync=True)
+    
+    description = Unicode(sync=True)
+    button_text = Unicode(sync=True)

IPython/html/widgets/widget_selectioncontainer.py

@@ -1,59 +1,57 b''
 """SelectionContainerWidget class.  
 
 Represents a multipage container that can be used to group other widgets into
 pages.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
-from .widget import DOMWidget
+from .widget_container import ContainerWidget
 from IPython.utils.traitlets import Unicode, Dict, CInt, List, Instance
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class AccordionWidget(DOMWidget):
+class AccordionWidget(ContainerWidget):
     view_name = Unicode('AccordionView', sync=True)
 
     # Keys
     _titles = Dict(help="Titles of the pages", sync=True)
     selected_index = CInt(0, sync=True)
 
-    children = List(Instance(DOMWidget), sync=True)
-
     # Public methods
     def set_title(self, index, title):
         """Sets the title of a container page.
 
         Parameters
         ----------
         index : int
             Index of the container page
         title : unicode
             New title"""
         self._titles[index] = title
         self.send_state('_titles')
 
     def get_title(self, index):
         """Gets the title of a container pages.
 
         Parameters
         ----------
         index : int
             Index of the container page"""
         if index in self._titles:
             return self._titles[index]
         else:
             return None
 
 
 class TabWidget(AccordionWidget):
     view_name = Unicode('TabView', sync=True)