Merge pull request #3928 from MaksimSimkin/master

apply extraStyle property to give possibility to change style of dedi…

Author: mportuga

src/js/core/factories/GridColumn.js

@@ -81,7 +81,17 @@ angular.module('ui.grid')
    * <pre>{ term: 'text', condition: uiGridConstants.filter.STARTS_WITH, placeholder: 'type to filter...', ariaLabel: 'Filter for text', flags: { caseSensitive: false }, type: uiGridConstants.filter.SELECT, [ { value: 1, label: 'male' }, { value: 2, label: 'female' } ] }</pre>
    *
    */
-
+   
+  /** 
+   * @ngdoc property
+   * @name extraStyle
+   * @propertyOf ui.grid.class:GridColumn
+   * @description additional on this column.  
+   * @example
+   * <pre>{extraStyle: {display:'table-cell'}}</pre>
+   *
+   */   
+    
   /**
    * @ngdoc object
    * @name ui.grid.class:GridColumn
@@ -795,6 +805,7 @@ angular.module('ui.grid')
     // However, we do want to keep the settings if they change, just not the term
     if ( isNew ) {
       self.setPropertyOrDefault(colDef, 'filter');
+      self.setPropertyOrDefault(colDef, 'extraStyle');
       self.setPropertyOrDefault(colDef, 'filters', defaultFilters);
     } else if ( self.filters.length === defaultFilters.length ) {
       self.filters.forEach( function( filter, index ){

src/templates/ui-grid/ui-grid-filter.html

@@ -1,5 +1,6 @@
 <div
   class="ui-grid-filter-container"
+  ng-style="col.extraStyle"
   ng-repeat="colFilter in col.filters"
   ng-class="{'ui-grid-filter-cancel-button-hidden' : colFilter.disableCancelFilterButton === true }">
   <div
@@ -31,6 +32,7 @@
     <select
       class="ui-grid-filter-select ui-grid-filter-input-{{$index}}"
       ng-model="colFilter.term"
+      ng-show="colFilter.selectOptions.length > 0"
       ng-attr-placeholder="{{colFilter.placeholder || aria.defaultFilterLabel}}"
       aria-label="{{colFilter.ariaLabel || ''}}"
       ng-options="option.value as option.label for option in colFilter.selectOptions">