Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 7, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7241e4
apply extraStyle property to give possibility to change style of dedi…
Jul 3, 2015
42774c5
apply extraStyle property to give possibility to change style of dedi…
Jul 3, 2015
4752eaf
Merge branch 'master' of https://github.com/MaksimSimkin/ng-grid
Jul 15, 2015
10abe8b
fix issue with not property shown selects, if options are loaded in …
Jul 15, 2015
f8af72a
Merge remote-tracking branch 'upstream/master'
MaksimSimkin Sep 20, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/js/core/factories/GridColumn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ){
Expand Down
2 changes: 2 additions & 0 deletions src/templates/ui-grid/ui-grid-filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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">
Expand Down