Skip to content

Commit

Permalink
Merge branch '7.1.x' into MKamenov/groupby-icons-71x
Browse files Browse the repository at this point in the history
  • Loading branch information
kdinev authored Feb 5, 2019
2 parents 3470f45 + f7275d0 commit 2de78dd
Show file tree
Hide file tree
Showing 23 changed files with 722 additions and 182 deletions.
11 changes: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Ignite UI for Angular Change Log

All notable changes for each version of this project will be documented in this file.
## 7.1.4
### Features
- `Column Hiding UI`
- **Behavioral Change** - The UI now hides the columns whose `disableHiding` property is set to true instead of simply disabling them.

## 7.1.2
### Features
- `igx-circular-bar` and `igx-linear-bar` now feature an indeterminate input property. When this property is set to true the indicator will be continually growing and shrinking along the track.
Expand Down Expand Up @@ -58,7 +63,7 @@ All notable changes for each version of this project will be documented in this
### Features
- `igxGrid`
- `locale` property added. Default value is `en`. All child components will use it as locale.

### Bug Fixes
* onSortingDone is not fired when sorting indicator of a header in the group by area is clicked ([#3257](https://github.com/IgniteUI/igniteui-angular/issues/3257))
* igx-grid isn't displayed properly in IE11 when it is inside an igx-tabs-group ([#3047](https://github.com/IgniteUI/igniteui-angular/issues/3047))
Expand Down Expand Up @@ -185,7 +190,7 @@ All notable changes for each version of this project will be documented in this

### Bug Fixes
- Setting required IgxInput's value not via typing does not clear the invalid style ([3550](https://github.com/IgniteUI/igniteui-angular/issues/3550))
- igx-grid isn't displayed properly in IE11 when it is inside an igx-tabs-group ([3047](https://github.com/IgniteUI/igniteui-angular/issues/3047))
- igx-grid isn't displayed properly in IE11 when it is inside an igx-tabs-group ([3047](https://github.com/IgniteUI/igniteui-angular/issues/3047))
- igxGrid minimal body height when no total height is set or inferred ([1693](https://github.com/IgniteUI/igniteui-angular/issues/1693))
- Horizontal scrollbar is not shown when column's width is set to a percentage value ([3513](https://github.com/IgniteUI/igniteui-angular/issues/3513))
- Visible @hidden tag due to comment structure ([3523](https://github.com/IgniteUI/igniteui-angular/issues/3523))
Expand All @@ -196,7 +201,7 @@ All notable changes for each version of this project will be documented in this
- Calendar test is failing because of wrong selector ([3508](https://github.com/IgniteUI/igniteui-angular/issues/3508))
- When transactions are enabled and delete a row page is changed to first page ([3425](https://github.com/IgniteUI/igniteui-angular/issues/3425))
- When a column is sorted and change value in a cell after commit and press enter on selected cell the focus is not in the input ([2801](https://github.com/IgniteUI/igniteui-angular/issues/2801))
- igxFor with scrollOrientation: horizontal - Almost all the items are not rendered when they don't have width property ([3087](https://github.com/IgniteUI/igniteui-angular/issues/3087))
- igxFor with scrollOrientation: horizontal - Almost all the items are not rendered when they don't have width property ([3087](https://github.com/IgniteUI/igniteui-angular/issues/3087))
- Pressing ESC on a cell in an editable column throws an error ([3429](https://github.com/IgniteUI/igniteui-angular/issues/3429))

## 6.2.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
withCredentials: false
}
}).done((data) => {
const folders = data.folders;
let folders = data.folders;
const select = $('#versions');
const lastVersion = folders.slice(-1)[0];

folders = folders.reverse();
folders.forEach(f => {
select.append($('<option>', {
value: `${baseUrl}/angular-docs/${f}/sass`,
Expand Down
12 changes: 9 additions & 3 deletions extras/docs/themes/sassdoc/views/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
<link rel="stylesheet" href="https://use.typekit.net/zhy2hpz.css">
<link rel="stylesheet" href="assets/css/main.css" />

{{!-- <script src="../assets/js/versioning/tag-versions.req.js"></script> --}}

<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
<script src="https://code.jquery.com/jquery-2.1.4.min.js" integrity="sha256-8WqyJLuWKRBVhxXIL1jBDD7SDxU936oZkCnxQbWwJVw=" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/jquery-migrate.min.js"></script>


<!-- Google Tag Manager -->
<script>
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
Expand All @@ -39,6 +46,7 @@

{{> header}}

<script src="assets/js/versioning/tag-versions.req.js"></script>
{{!
! You can access any variable you set in your configuration file from the `view` object.
! Basically your configuration file is passed to the view as the `view` object.
Expand Down Expand Up @@ -169,9 +177,7 @@
<script src="assets/js/vendor/highlight.pack.js"></script>
<script src="https://unpkg.com/lunr/lunr.js"></script>
<script>window.sassdocIndex = {{{json idx}}}</script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
<script src="https://code.jquery.com/jquery-2.1.4.min.js" integrity="sha256-8WqyJLuWKRBVhxXIL1jBDD7SDxU936oZkCnxQbWwJVw=" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/jquery-migrate.min.js"></script>

<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/plugins.nav.js"></script>
<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/navigation.js"></script>
<script src="assets/js/main.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
withCredentials: false
}
}).done((data) => {
const folders = data.folders;
let folders = data.folders;
const select = $('#versions')
const lastVersion = folders.slice(-1)[0];

folders = folders.reverse();
folders.forEach(f => {
select.append($('<option>', {
value: `${baseUrl}/angular-docs/${f}/typescript`,
Expand Down
3 changes: 2 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ const SASSDOC_THEME = {

gulp.task('sassdoc-clear-main', () => {
del.sync(`${SASSDOC_THEME.JS_DIR}/main.js`)
del.sync(`${SASSDOC_THEME.JS_DIR}/main.d.ts`)
})

gulp.task('sassdoc-ts',
Expand All @@ -263,7 +264,7 @@ gulp.task('sassdoc-ts',

gulp.task('sassdoc-js', ['sassdoc-ts'], () => {
gulp.src([
`${SASSDOC_THEME.JS_DIR}/**/*.js`,
`${SASSDOC_THEME.JS_DIR}/**/!(tag-versions.req)*.js`,
])
.pipe(concat('main.js'))
.pipe(gulp.dest(SASSDOC_THEME.JS_DIR));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ <h4 class="igx-column-hiding__header-title" *ngIf="title">{{ title }}</h4>

<div class="igx-column-hiding__columns"
[style.max-height]="columnsAreaMaxHeight">
<igx-checkbox igxColumnHidingItem
*ngFor="let columnItem of columnItems"
<igx-checkbox
*ngFor="let columnItem of hidableColumns"
class="igx-column-hiding__columns-item"
(onColumnVisibilityChanged)="onVisibilityChanged($event)"
(change)="columnItem.value = !columnItem.value"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ export class IgxColumnHidingComponent extends ColumnChooserBase implements OnDes
super(cdr);
}

private get hidableColumns() {
/**
*@hidden
*/
public get hidableColumns() {
return this.columnItems.filter((col) => !col.disabled);
}

Expand Down
15 changes: 1 addition & 14 deletions projects/igniteui-angular/src/lib/grids/column.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,20 +198,7 @@ export class IgxColumnComponent implements AfterContentInit {
}
this.check();
if (this.grid) {
const activeInfo = IgxTextHighlightDirective.highlightGroupsMap.get(this.grid.id);
if (!activeInfo) {
return;
}
const oldIndex = activeInfo.columnIndex;

if (this.grid.lastSearchInfo.searchText) {
if (this.index <= oldIndex) {
const newIndex = this.hidden ? oldIndex - 1 : oldIndex + 1;
IgxColumnComponent.updateHighlights(oldIndex, newIndex, this.grid);
} else if (oldIndex === -1 && !this.hidden) {
this.grid.refreshSearch();
}
}
this.grid.refreshSearch(true);
this.grid.summaryService.resetSummaryHeight();
this.grid.reflow();
this.grid.filteringService.refreshExpressions();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,9 @@ export class IgxGridFilteringRowComponent implements AfterViewInit {
}

if (this.input) {
this.input.nativeElement.focus();
// Add requestAnimationFrame becasue of an issue in IE, where you are still able to write in the input,
// if it has been focused and then set to readonly.
requestAnimationFrame(() => this.input.nativeElement.focus());
}
}

Expand Down
Loading

0 comments on commit 2de78dd

Please sign in to comment.