Better fix for empty dropdown button alignment

Now an   character is inserted and bootstrap is left alone to deal with alignment.

IPython/html/static/notebook/js/widgets/selection.js

@@ -1,251 +1,260
 define(["notebook/js/widget"], function(){
     var SelectionWidgetModel = IPython.WidgetModel.extend({});
     IPython.widget_manager.register_widget_model('SelectionWidgetModel', SelectionWidgetModel);
 
     var DropdownView = IPython.WidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$buttongroup = $('<div />')
                                 .addClass('widget_item')
                                 .addClass('btn-group')
                                 .appendTo(this.$el);
             this.$el_to_style = this.$buttongroup; // Set default element to style
             this.$droplabel = $('<button />')
                                 .addClass('btn')
                                 .addClass('widget-combo-btn')
+                                .html('&nbsp;')
                                 .appendTo(this.$buttongroup);
             this.$dropbutton = $('<button />')
                                 .addClass('btn')
                                 .addClass('dropdown-toggle')
+                                .addClass('widget-combo-carrot-btn')
                                 .attr('data-toggle', 'dropdown')
                                 .html('<span class="caret"></span>')
                                 .appendTo(this.$buttongroup);
             this.$droplist = $('<ul />')
                                 .addClass('dropdown-menu')
                                 .appendTo(this.$buttongroup);
             
             // Set defaults.
             this.update();
         },
         
         // Handles: Backend -> Frontend Sync
         //          Frontent -> Frontend Sync
         update : function(){
+
+            var selected_item_text = this.model.get('value');
+            selected_item_text.replace(' ', '');
+            if (selected_item_text == '') {
+                this.$droplabel.html('&nbsp;');
+            } else {
             this.$droplabel.html(this.model.get('value'));
+            }
             
             var items = this.model.get('values');
             this.$droplist.html('');
             for (var index in items) {
                 var that = this;
                 var item_button = $('<a href="#"/>')
                     .html(items[index])
                     .on('click', function(e){
                         that.model.set('value', $(e.target).html(), this);
                         that.model.update_other_views(that);
                     })
                 
                 this.$droplist.append($('<li />').append(item_button))
             }
             
             if (this.model.get('disabled')) {
                 this.$buttongroup.attr('disabled','disabled');
                 this.$droplabel.attr('disabled','disabled');
                 this.$dropbutton.attr('disabled','disabled');
                 this.$droplist.attr('disabled','disabled');
             } else {
                 this.$buttongroup.removeAttr('disabled');
                 this.$droplabel.removeAttr('disabled');
                 this.$dropbutton.removeAttr('disabled');
                 this.$droplist.removeAttr('disabled');
             }
 
             var description = this.model.get('description');
             if (description.length == 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
     });
 
     IPython.widget_manager.register_widget_view('DropdownView', DropdownView);
 
     var RadioButtonsView = IPython.WidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$container = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-container')
                 .addClass('vbox');
             this.$el_to_style = this.$container; // Set default element to style
             this.update();
         },
         
         // Handles: Backend -> Frontend Sync
         //          Frontent -> Frontend Sync
         update : function(){
             
             // Add missing items to the DOM.
             var items = this.model.get('values');
             var disabled = this.model.get('disabled');
             for (var index in items) {
                 var item_query = ' :input[value="' + items[index] + '"]';
                 if (this.$el.find(item_query).length == 0) {
                     var $label = $('<label />')
                         .addClass('radio')
                         .html(items[index])
                         .appendTo(this.$container);
                     
                     var that = this;
                     $('<input />')
                         .attr('type', 'radio')
                         .addClass(this.model)
                         .val(items[index])
                         .prependTo($label)
                         .on('click', function(e){
                             that.model.set('value', $(e.target).val(), this);
                             that.model.update_other_views(that);
                         });
                 }
                 
                 var $item_element = this.$container.find(item_query);
                 if (this.model.get('value') == items[index]) {
                     $item_element.prop('checked', true);
                 } else {
                     $item_element.prop('checked', false);
                 }
                 $item_element.prop('disabled', disabled);
             }
             
             // Remove items that no longer exist.
             this.$container.find('input').each(function(i, obj) {
                 var value = $(obj).val();
                 var found = false;
                 for (var index in items) {
                     if (items[index] == value) {
                         found = true;
                         break;
                     }
                 }
                 
                 if (!found) {
                     $(obj).parent().remove();
                 }
             });
 
             var description = this.model.get('description');
             if (description.length == 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
     });
 
     IPython.widget_manager.register_widget_view('RadioButtonsView', RadioButtonsView);
 
 
     var ToggleButtonsView = IPython.WidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$buttongroup = $('<div />')
                 .addClass('btn-group')
                 .attr('data-toggle', 'buttons-radio')
                 .appendTo(this.$el);
             this.$el_to_style = this.$buttongroup; // Set default element to style
             this.update();
         },
         
         // Handles: Backend -> Frontend Sync
         //          Frontent -> Frontend Sync
         update : function(){
             
             // Add missing items to the DOM.
             var items = this.model.get('values');
             var disabled = this.model.get('disabled');
             for (var index in items) {
                 var item_query = ' :contains("' + items[index] + '")';
                 if (this.$buttongroup.find(item_query).length == 0) {
                     
                     var that = this;
                     $('<button />')
                         .attr('type', 'button')
                         .addClass('btn')
                         .html(items[index])
                         .appendTo(this.$buttongroup)
                         .on('click', function(e){
                             that.model.set('value', $(e.target).html(), this);
                             that.model.update_other_views(that);
                         });
                 }
                 
                 var $item_element = this.$buttongroup.find(item_query);
                 if (this.model.get('value') == items[index]) {
                     $item_element.addClass('active');
                 } else {
                     $item_element.removeClass('active');
                 }
                 $item_element.prop('disabled', disabled);
             }
             
             // Remove items that no longer exist.
             this.$buttongroup.find('button').each(function(i, obj) {
                 var value = $(obj).html();
                 var found = false;
                 for (var index in items) {
                     if (items[index] == value) {
                         found = true;
                         break;
                     }
                 }
                 
                 if (!found) {
                     $(obj).remove();
                 }
             });
 
             var description = this.model.get('description');
             if (description.length == 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
     });
 
     IPython.widget_manager.register_widget_view('ToggleButtonsView', ToggleButtonsView);
 });

IPython/html/static/notebook/less/widgets.less

@@ -1,130 +1,129
 
 .widget-area {
     page-break-inside: avoid;
     .hbox();
 
     .widget-subarea {
         padding: 0.44em 0.4em 0.4em 1px;
         margin-left: 6px;
         .border-box-sizing();
         .vbox();
         .box-flex2();
 
         .widget-hlabel {
             min-width: 10ex;
             padding-right: 8px;
             text-align: right;
             vertical-align: text-top;
             padding-top: 3px;
         }
 
         .widget-vlabel {
             text-align: center;
             vertical-align: text-bottom;
             padding-bottom: 5px;
         }
 
         .widget-hslider {
             padding-left: 8px;
             padding-right: 5px;
             margin-top: 11px;
 
             width: 348px;
             height: 5px !important;
             overflow: visible !important;
 
             border: 1px solid #CCCCCC;
             background: #FFFFFF;
             .corner-all();
 
             .ui-slider {
                 border: 0px !important;
                 background: none !important;
 
                 .ui-slider-handle {
                     width: 14px !important;
                     height: 28px !important;
 
                     margin-top: -8px !important;
                 }
             }
         }
 
         .widget-vslider {
             border: 1px solid #CCCCCC;
             background: #FFFFFF;
             width: 5px;
             margin-left: 12px;
             padding-bottom: 14px;
             .corner-all();
             height: 250px;
 
             .ui-slider {
                 border: 0px !important;
                 background: none !important;
                 margin-left: -4px;
                 margin-top: 5px;
                 height: 100%;
 
                 .ui-slider-handle {
                     width: 28px !important;
                     height: 14px !important;
                     margin-left: -9px;
                 }
             }
         }
 
         .widget-text {
             width: 350px;
             margin-bottom: 0px;
         }
 
         .widget-numeric-text {
             width: 150px;
         }
 
         .widget-progress {
             width: 363px;
 
             /* Disable progress bar animation */
             .bar {
                 -webkit-transition: none;
                 -moz-transition: none;
                 -ms-transition: none;
                 -o-transition: none;
                 transition: none;
             }
         }
 
         .widget-combo-btn {
             min-width: 138px; /* + 26px drop arrow btn = 164px */
-            min-height: 1ex;
         }
 
         .widget-container {
             .border-box-sizing();
         }
 
         .widget-box {
             .start();
             .widget-container();
             margin: 5px;
         }
 
         .widget-hbox {
             .widget-box();
             .hbox();
         }
 
         .widget-hbox-single {
             .widget-hbox();
             height: 30px;
         }
 
         .widget-vbox-single {
             .widget-box();
             .vbox();
             width: 30px;
         }
     }
 }