Skip to content

Commit d5ed799

Browse files
authored
Merge branch 'master' into skrastev/fix-9158
2 parents 1cfdb0e + 714e050 commit d5ed799

File tree

12 files changed

+183
-203
lines changed

12 files changed

+183
-203
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ master ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ master ]
20+
schedule:
21+
- cron: '33 4 * * 4'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
language: [ 'javascript' ]
32+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
33+
# Learn more:
34+
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
35+
36+
steps:
37+
- name: Checkout repository
38+
uses: actions/checkout@v2
39+
40+
# Initializes the CodeQL tools for scanning.
41+
- name: Initialize CodeQL
42+
uses: github/codeql-action/init@v1
43+
with:
44+
languages: ${{ matrix.language }}
45+
# If you wish to specify custom queries, you can do so here or in a config file.
46+
# By default, queries listed here will override any specified in a config file.
47+
# Prefix the list here with "+" to use these queries and those in the config file.
48+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
49+
50+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
51+
# If this step fails, then you should remove it and run the build manually (see below)
52+
- name: Autobuild
53+
uses: github/codeql-action/autobuild@v1
54+
55+
# ℹ️ Command-line programs to run using the OS shell.
56+
# 📚 https://git.io/JvXDl
57+
58+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
59+
# and modify them (or add more) to build your code if your project
60+
# uses a compiled language
61+
62+
#- run: |
63+
# make bootstrap
64+
# make release
65+
66+
- name: Perform CodeQL Analysis
67+
uses: github/codeql-action/analyze@v1

projects/igniteui-angular/migrations/update-12_0_0/changes/theme-props.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
"owner": "igx-button-theme"
323323
},
324324
{
325-
"name": "$disabled-text-color",
325+
"name": "$disabled-color",
326326
"replaceWith": "$disabled-foreground",
327327
"owner": "igx-button-theme"
328328
}

projects/igniteui-angular/src/lib/core/styles/themes/_index.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,16 @@
6969
/// @param {Map} $schema [$light-schema] - The schema used as basis for styling the components.
7070
/// @param {List} $exclude [( )] - A list of igx components to be excluded from the global theme styles.
7171
/// @param {Boolean} $legacy-support [false] - If set to true, it turns on support for IE11, i.e. css variables are not used in the generated component themes.
72-
/// @param {Boolean} $elevation [true] - Turns on/off elevations for all components in the theme.
7372
/// @param {Number} $roundness [null] - Sets the global roundness factor (the value can be any decimal fraction between 0 and 1) for all components.
73+
/// @param {Boolean} $elevation [true] - Turns on/off elevations for all components in the theme.
74+
/// @param {Map} $elevations [$igx-elevations] - The elevation map to be used by all component themes.
7475
/// @requires $components
7576
/// @requires $default-palette
77+
/// @requires $igx-elevations
7678
/// @requires {function} is-component
7779
@mixin igx-theme(
7880
$palette,
79-
$schema: $light-schema,
81+
$schema: $light-material-schema,
8082
$exclude: (),
8183
$legacy-support: false,
8284
$roundness: null,

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5955,6 +5955,22 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
59555955
}
59565956
}
59575957

5958+
/**
5959+
* Finishes the row transactions on the current row.
5960+
*
5961+
* @remarks
5962+
* If `commit === true`, passes them from the pending state to the data (or transaction service)
5963+
* @example
5964+
* ```html
5965+
* <button igxButton (click)="grid.endEdit(true)">Commit Row</button>
5966+
* ```
5967+
* @param commit
5968+
*/
5969+
// TODO: Facade for crud service refactoring. To be removed
5970+
public endEdit(commit = true, event?: Event) {
5971+
this.crudService.endEdit(commit, event);
5972+
}
5973+
59585974
protected writeToData(rowIndex: number, value: any) {
59595975
mergeObjects(this.gridAPI.get_all_data()[rowIndex], value);
59605976
}

src/app/grid-finjs/controllers.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="controls-holder">
33
<div class="switches">
44
<div class="control-item">
5-
<igx-switch [checked]="false" [(ngModel)]="theme" (change)="onChange('theme', $event)">Dark</igx-switch>
5+
<igx-switch [checked]="false" (change)="onChange('theme', $event)">Dark</igx-switch>
66
</div>
77
<div class="control-item">
88
<igx-switch [checked]="true" (change)="onChange('grouped', $event)" color="blue" cssClass="finjs-sample-switch">

src/app/grid-finjs/controllers.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ export class ControllerComponent implements OnInit, OnDestroy {
1818
@Output() public volumeChanged = new EventEmitter<any>();
1919
@Output() public playAction = new EventEmitter<any>();
2020

21-
public selectionMode = 'multiple';
22-
public theme = false;
21+
public darkTheme = true;
2322
public volume = 1000;
2423
public frequency = 500;
2524
public controls = [

src/app/grid-finjs/grid-finjs.component.html

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
<igx-grid #grid1 igxPreventDocumentScroll [data]="data" width="100%" height="800px" [autoGenerate]='false' displayDensity='compact' hiddenColumnsText="Hidden" primaryKey='ID' [rowSelection]="selectionMode" [allowFiltering]="true" [filterMode]="'excelStyleFilter'">
1+
<igx-grid #grid1
2+
igxPreventDocumentScroll
3+
width="100%" height="800px"
4+
displayDensity='compact'
5+
hiddenColumnsText="Hidden"
6+
primaryKey='ID'
7+
[(groupingExpressions)]="groupingExpressions"
8+
[autoGenerate]='false'
9+
[data]="data"
10+
[hideGroupedColumns]="true"
11+
[rowSelection]="selectionMode"
12+
[allowFiltering]="true"
13+
[filterMode]="'excelStyleFilter'">
214

315
<igx-grid-toolbar *ngIf="showToolbar">
416
<igx-grid-toolbar-actions>
@@ -35,7 +47,7 @@
3547
</ng-template>
3648
</igx-column>
3749
<igx-column [field]="'LastUpdated'" [width]="'120px'" [editable]='true' header="Last Update" dataType="date"></igx-column>
38-
<igx-column [field]="'Open Price'" [width]="'120px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
50+
<igx-column [field]="'Open Price'" [width]="'120px'" dataType="currency" [pipeArgs]="columnFormat" [movable]="true" [sortable]="true"></igx-column>
3951
<igx-column [field]="'Price'" [width]="'110px'" dataType="number" [cellClasses]="trends" [movable]="true" [sortable]="true">
4052
<ng-template igxCell let-cell="cell">
4153
<div class="finjs-icons">
@@ -53,22 +65,22 @@
5365
</ng-template>
5466
</igx-column>
5567

56-
<igx-column [field]="'Change'" [width]="'120px'" dataType="number" [headerClasses]="'headerAlignSyle'" [sortable]="true" [cellClasses]="trendsChange" [formatter]="formatNumber" [movable]="true">
68+
<igx-column [field]="'Change'" [width]="'120px'" dataType="number" [headerClasses]="'headerAlignSyle'" [sortable]="true" [cellClasses]="trendsChange" [movable]="true">
5769
</igx-column>
5870

59-
<igx-column [field]="'Change(%)'" [width]="'110px'" dataType="number" [formatter]="percentage" [movable]="true" [sortable]="true" [cellClasses]="trendsChange">
71+
<igx-column [field]="'Change(%)'" [width]="'110px'" dataType="percent" [movable]="true" [sortable]="true" [cellClasses]="trendsChange">
6072
</igx-column>
6173

62-
<igx-column [field]="'Buy'" [width]="'110px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
63-
<igx-column [field]="'Sell'" [width]="'110px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
64-
<igx-column [field]="'Spread'" [width]="'110px'" dataType="number" [formatter]="formatNumber" [movable]="true">
74+
<igx-column [field]="'Buy'" [width]="'110px'" dataType="currency" [pipeArgs]="columnFormat" [movable]="true" [sortable]="true"></igx-column>
75+
<igx-column [field]="'Sell'" [width]="'110px'" dataType="currency" [pipeArgs]="columnFormat" [movable]="true" [sortable]="true"></igx-column>
76+
<igx-column [field]="'Spread'" [width]="'110px'" dataType="number" [pipeArgs]="columnFormat" [movable]="true">
6577
</igx-column>
66-
<igx-column [field]="'Volume'" [width]="'110px'" dataType="number" [formatter]="formatNumber" [movable]="true" [sortable]="true"></igx-column>
67-
<igx-column [field]="'High(D)'" [width]="'110px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
68-
<igx-column [field]="'Low(D)'" [width]="'110px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
69-
<igx-column [field]="'High(Y)'" [width]="'110px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
70-
<igx-column [field]="'Low(Y)'" [width]="'110px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
71-
<igx-column [field]="'Start(Y)'" [width]="'110px'" dataType="number" [formatter]="formatCurrency" [movable]="true" [sortable]="true"></igx-column>
78+
<igx-column [field]="'Volume'" [width]="'110px'" dataType="number" [movable]="true" [sortable]="true"></igx-column>
79+
<igx-column [field]="'High(D)'" [width]="'110px'" dataType="currency" [movable]="true" [sortable]="true"></igx-column>
80+
<igx-column [field]="'Low(D)'" [width]="'110px'" dataType="currency" [movable]="true" [sortable]="true"></igx-column>
81+
<igx-column [field]="'High(Y)'" [width]="'110px'" dataType="currency" [movable]="true" [sortable]="true"></igx-column>
82+
<igx-column [field]="'Low(Y)'" [width]="'110px'" dataType="currency" [movable]="true" [sortable]="true"></igx-column>
83+
<igx-column [field]="'Start(Y)'" [width]="'110px'" dataType="currency" [movable]="true" [sortable]="true"></igx-column>
7284
<igx-column [field]="'IndGrou'" [width]="'100px'" [filterable]='false'></igx-column>
7385
<igx-column [field]="'IndSect'" [width]="'120px'" [filterable]='false' [resizable]='true'></igx-column>
7486
<igx-column [field]="'IndSubg'" [width]="'100px'" [filterable]='false'></igx-column>

0 commit comments

Comments
 (0)