Merge pull request #305 from SylvainCorlay/box_style-fix

SylvainCorlay · SylvainCorlay · commit 82d1a14df9c7 · 2016-01-11T10:10:53.000-05:00
Box predefined styling was not updating correctly
diff --git a/ipywidgets/static/widgets/js/widget.js b/ipywidgets/static/widgets/js/widget.js
@@ -714,7 +714,7 @@ define(["./utils",
             });
         },
 
-        update_mapped_classes: function(class_map, trait_name, previous_trait_value, el) {
+        update_mapped_classes: function(class_map, trait_name, el) {
             /**
              * Update the DOM classes applied to the widget based on a single
              * trait's value.
@@ -736,15 +736,10 @@ define(["./utils",
              *      };
              * trait_name: string
              *  Name of the trait to check the value of.
-             * previous_trait_value: optional string, default ''
-             *  Last trait value
              * el: optional DOM element handle, defaults to this.$el
              *  Element that the classes are applied to.
              */
-            var key = previous_trait_value;
-            if (key === undefined) {
-                key = this.model.previous(trait_name);
-            }
+            var key = this.model.previous(trait_name);
             var old_classes = class_map[key] ? class_map[key] : [];
             key = this.model.get(trait_name);
             var new_classes = class_map[key] ? class_map[key] : [];
diff --git a/ipywidgets/static/widgets/js/widget_bool.js b/ipywidgets/static/widgets/js/widget_bool.js
@@ -91,23 +91,21 @@ define([
                     that.handle_click();
                 }));
             this.$el.attr("data-toggle", "tooltip");
-            this.listenTo(this.model, 'change:button_style', function(model, value) {
-                this.update_button_style();
-            }, this);
-            this.update_button_style('');
+            this.listenTo(this.model, "change:button_style", this.update_button_style, this);
+            this.update_button_style();
 
             this.update(); // Set defaults.
         },
 
-        update_button_style: function(previous_trait_value) {
+        update_button_style: function() {
             var class_map = {
                 primary: ['btn-primary'],
                 success: ['btn-success'],
                 info: ['btn-info'],
                 warning: ['btn-warning'],
                 danger: ['btn-danger']
             };
-            this.update_mapped_classes(class_map, 'button_style', previous_trait_value);
+            this.update_mapped_classes(class_map, 'button_style');
         },
 
         update : function(options){
diff --git a/ipywidgets/static/widgets/js/widget_box.js b/ipywidgets/static/widgets/js/widget_box.js
@@ -113,7 +113,7 @@ define([
             }, this);
             this.listenTo(this.model, 'change:overflow_x', this.update_overflow_x, this);
             this.listenTo(this.model, 'change:overflow_y', this.update_overflow_y, this);
-            this.listenTo(this.model, 'change:box_style', this.update_box_style, this);
+            this.listenTo(this.model, "change:box_style", this.update_box_style, this);
         },
 
         update_attr: function(name, value) { // TODO: Deprecated in 5.0
@@ -132,7 +132,7 @@ define([
             this.children_views.update(this.model.get('children'));
             this.update_overflow_x();
             this.update_overflow_y();
-            this.update_box_style('');
+            this.update_box_style();
         },
 
         update_overflow_x: function() {
@@ -149,14 +149,14 @@ define([
             this.$box.css('overflow-y', this.model.get('overflow_y'));
         },
 
-        update_box_style: function(previous_trait_value) {
+        update_box_style: function() {
             var class_map = {
                 success: ['alert', 'alert-success'],
                 info: ['alert', 'alert-info'],
                 warning: ['alert', 'alert-warning'],
                 danger: ['alert', 'alert-danger']
             };
-            this.update_mapped_classes(class_map, 'box_style', previous_trait_value, this.$box[0]);
+            this.update_mapped_classes(class_map, 'box_style', this.$box[0]);
         },
 
         add_child_model: function(model) {
diff --git a/ipywidgets/static/widgets/js/widget_button.js b/ipywidgets/static/widgets/js/widget_button.js
@@ -18,10 +18,8 @@ define([
             this.setElement($("<button />")
                 .addClass('ipy-widget widget-button btn btn-default'));
             this.$el.attr("data-toggle", "tooltip");
-            this.listenTo(this.model, 'change:button_style', function(model, value) {
-                this.update_button_style();
-            }, this);
-            this.update_button_style('');
+            this.listenTo(this.model, "change:button_style", this.update_button_style, this);
+            this.update_button_style();
 
             this.update(); // Set defaults.
         },
@@ -48,15 +46,15 @@ define([
             return ButtonView.__super__.update.apply(this);
         },
 
-        update_button_style: function(previous_trait_value) {
+        update_button_style: function() {
             var class_map = {
                 primary: ['btn-primary'],
                 success: ['btn-success'],
                 info: ['btn-info'],
                 warning: ['btn-warning'],
                 danger: ['btn-danger']
             };
-            this.update_mapped_classes(class_map, 'button_style', previous_trait_value);
+            this.update_mapped_classes(class_map, 'button_style');
         },
 
         events: {
diff --git a/ipywidgets/static/widgets/js/widget_int.js b/ipywidgets/static/widgets/js/widget_int.js
@@ -492,14 +492,12 @@ define([
             this.update(); 
             this.updateDescription();
            
-            this.listenTo(this.model, 'change:bar_style', function(model, value) {
-                this.update_bar_style();
-            }, this);
-            this.listenTo(this.model, 'change:description', function(sender, value) {
+            this.listenTo(this.model, "change:bar_style", this.update_bar_style, this);
+            this.listenTo(this.model, "change:description", function(sender, value) {
                 this.updateDescription();
             }, this);
             
-            this.update_bar_style('');
+            this.update_bar_style();
         },
         
         updateDescription: function() {
@@ -548,14 +546,14 @@ define([
             return ProgressView.__super__.update.apply(this);
         }, 
 
-        update_bar_style: function(previous_trait_value) {
+        update_bar_style: function() {
             var class_map = {
                 success: ['progress-bar-success'],
                 info: ['progress-bar-info'],
                 warning: ['progress-bar-warning'],
                 danger: ['progress-bar-danger']
             };
-            this.update_mapped_classes(class_map, 'bar_style', previous_trait_value, this.$bar[0]);
+            this.update_mapped_classes(class_map, 'bar_style', this.$bar[0]);
         },
 
         update_attr: function(name, value) { // TODO: Deprecated in 5.0
diff --git a/ipywidgets/static/widgets/js/widget_selection.js b/ipywidgets/static/widgets/js/widget_selection.js
@@ -43,10 +43,8 @@ define([
                 .addClass('dropdown-menu')
                 .appendTo(this.$buttongroup);
 
-            this.listenTo(this.model, 'change:button_style', function(model, value) {
-                this.update_button_style();
-            }, this);
-            this.update_button_style('');
+            this.listenTo(this.model, "change:button_style", this.update_button_style, this);
+            this.update_button_style();
 
             // Set defaults.
             this.update();
@@ -108,16 +106,16 @@ define([
             return DropdownView.__super__.update.apply(this);
         },
 
-        update_button_style: function(previous_trait_value) {
+        update_button_style: function() {
             var class_map = {
                 primary: ['btn-primary'],
                 success: ['btn-success'],
                 info: ['btn-info'],
                 warning: ['btn-warning'],
                 danger: ['btn-danger']
             };
-            this.update_mapped_classes(class_map, 'button_style', previous_trait_value, this.$droplabel[0]);
-            this.update_mapped_classes(class_map, 'button_style', previous_trait_value, this.$dropbutton[0]);
+            this.update_mapped_classes(class_map, 'button_style', this.$droplabel[0]);
+            this.update_mapped_classes(class_map, 'button_style', this.$dropbutton[0]);
         },
 
         update_attr: function(name, value) { // TODO: Deprecated in 5.0
@@ -278,10 +276,8 @@ define([
                 .addClass('btn-group')
                 .appendTo(this.$el);
 
-            this.listenTo(this.model, 'change:button_style', function(model, value) {
-                this.update_button_style();
-            }, this);
-            this.update_button_style('');
+            this.listenTo(this.model, 'change:button_style', this.update_button_style, this);
+            this.update_button_style();
             this.update();
         },
 
@@ -391,15 +387,15 @@ define([
             }
         },
 
-        update_button_style: function(previous_trait_value) {
+        update_button_style: function() {
             var class_map = {
                 primary: ['btn-primary'],
                 success: ['btn-success'],
                 info: ['btn-info'],
                 warning: ['btn-warning'],
                 danger: ['btn-danger']
             };
-            this.update_mapped_classes(class_map, 'button_style', previous_trait_value, this.$buttongroup.find('button')[0]);
+            this.update_mapped_classes(class_map, 'button_style', this.$buttongroup.find('button')[0]);
         },
 
         handle_click: function (e) {
@@ -416,7 +412,7 @@ define([
 
 
     var SelectView = widget.DOMWidgetView.extend({
-        render : function() {
+        render: function() {
             /**
              * Called when view is rendered.
              */
@@ -434,7 +430,7 @@ define([
             this.update();
         },
 
-        update : function(options) {
+        update: function(options) {
             /**
              * Update the contents of this view
              *
diff --git a/ipywidgets/widgets/widget_bool.py b/ipywidgets/widgets/widget_bool.py
@@ -57,9 +57,8 @@ class ToggleButton(_Bool):
     icon = Unicode('', help= "Font-awesome icon.", sync=True)
 
     button_style = CaselessStrEnum(
-        values=['primary', 'success', 'info', 'warning', 'danger', ''],
-        default_value='', allow_none=True, sync=True, help="""Use a
-        predefined styling for the button.""")
+        values=['primary', 'success', 'info', 'warning', 'danger', ''], default_value='',
+        sync=True, help="""Use a predefined styling for the button.""")
 
 
 @register('Jupyter.Valid')
diff --git a/ipywidgets/widgets/widget_box.py b/ipywidgets/widgets/widget_box.py
@@ -34,9 +34,8 @@ class Box(DOMWidget):
         happens to content that is too large for the rendered region.""")
 
     box_style = CaselessStrEnum(
-        values=['success', 'info', 'warning', 'danger', ''],
-        default_value='', allow_none=True, sync=True, help="""Use a
-        predefined styling for the box.""")
+        values=['success', 'info', 'warning', 'danger', ''], default_value='',
+        sync=True, help="""Use a predefined styling for the box.""")
 
     def __init__(self, children = (), **kwargs):
         kwargs['children'] = children
diff --git a/ipywidgets/widgets/widget_button.py b/ipywidgets/widgets/widget_button.py
@@ -15,30 +15,30 @@
 @register('Jupyter.Button')
 class Button(DOMWidget):
     """Button widget.
-       This widget has an `on_click` method that allows you to listen for the
-       user clicking on the button.  The click event itself is stateless.
 
-       Parameters
-       ----------
-       description : str
-           description displayed next to the button
-       tooltip: str
-           tooltip caption of the toggle button
-       icon: str
-           font-awesome icon name
+    This widget has an `on_click` method that allows you to listen for the
+    user clicking on the button.  The click event itself is stateless.
+
+    Parameters
+    ----------
+    description: str
+       description displayed next to the button
+    tooltip: str
+       tooltip caption of the toggle button
+    icon: str
+       font-awesome icon name
     """
     _view_name = Unicode('ButtonView', sync=True)
 
     # Keys
     description = Unicode('', help="Button label.", sync=True)
     tooltip = Unicode(help="Tooltip caption of the button.", sync=True)
     disabled = Bool(False, help="Enable or disable user changes.", sync=True)
-    icon = Unicode('', help= "Font-awesome icon.", sync=True)
+    icon = Unicode('', help="Font-awesome icon.", sync=True)
 
     button_style = CaselessStrEnum(
-        values=['primary', 'success', 'info', 'warning', 'danger', ''],
-        default_value='', allow_none=True, sync=True, help="""Use a
-        predefined styling for the button.""")
+        values=['primary', 'success', 'info', 'warning', 'danger', ''], default_value='',
+        sync=True, help="""Use a predefined styling for the button.""")
 
     def __init__(self, **kwargs):
         """Constructor"""
@@ -49,13 +49,14 @@ def __init__(self, **kwargs):
     def on_click(self, callback, remove=False):
         """Register a callback to execute when the button is clicked.
 
-        The callback will be called with one argument,
-        the clicked button widget instance.
+        The callback will be called with one argument, the clicked button
+        widget instance.
 
         Parameters
         ----------
-        remove : bool (optional)
-            Set to true to remove the callback from the list of callbacks."""
+        remove: bool (optional)
+            Set to true to remove the callback from the list of callbacks.
+        """
         self._click_handlers.register_callback(callback, remove=remove)
 
     def _handle_button_msg(self, _, content, buffers):
@@ -64,6 +65,7 @@ def _handle_button_msg(self, _, content, buffers):
         Parameters
         ----------
         content: dict
-            Content of the msg."""
+            Content of the msg.
+        """
         if content.get('event', '') == 'click':
             self._click_handlers(self)
