Skip to content

Commit e3410ac

Browse files
Merge branch 'master' into bpenkov/date-range-disabled-onpush
2 parents 0d7f920 + bdf3734 commit e3410ac

39 files changed

+3614
-1296
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ All notable changes for each version of this project will be documented in this
6262
- `IgxExcelExporterService`
6363
- Added support for exporting the grids' multi-column headers to **Excel**. By default, the multi-column headers would be exported but this behavior can be controlled by the `ignoreMultiColumnHeaders` option off the IgxExcelExporterOptions object.
6464

65+
66+
- `IgxDateTimeEditor`, `IgxMask`, `IgxDatePicker`, `IgxTimePicker`, `IgxDateRangePicker`
67+
- Added IME input support. When typing in an Asian language input, the control will display input method compositions and candidate lists directly in the control’s editing area, and immediately re-flow surrounding text as the composition ends.
68+
6569
### General
6670
- `IgxPaginatorComponent`
6771
- Deprecated properties `selectLabel` and `prepositionPage` are now removed;

gulpfile.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const autoprefixer = require('autoprefixer');
44
const browserSync = require('browser-sync').create();
55
const del = require('del');
66
const gulp = require('gulp');
7-
const sass = require('gulp-dart-sass');
7+
const sass = require('gulp-sass')(require('sass'));
88
const sourcemaps = require('gulp-sourcemaps');
99
const postcss = require('gulp-postcss');
1010
const process = require('process');
@@ -16,19 +16,19 @@ const EventEmitter = require('events').EventEmitter;
1616
const { series } = require('gulp');
1717
const {spawnSync} = require('child_process');
1818
const slash = require('slash');
19-
20-
sass.compiler = require('sass');
19+
const Fiber = require('fibers');
2120

2221
const STYLES = {
23-
SRC: './projects/igniteui-angular/src/lib/core/styles/themes/presets/*',
22+
SRC: './projects/igniteui-angular/src/lib/core/styles/themes/presets/**/*',
2423
DIST: './dist/igniteui-angular/styles',
2524
MAPS: './maps',
2625
THEMING: {
2726
SRC: './projects/igniteui-angular/src/lib/core/styles/**/*',
2827
DIST: './dist/igniteui-angular/lib/core/styles'
2928
},
3029
CONFIG: {
31-
outputStyle: 'compressed'
30+
outputStyle: 'compressed',
31+
fiber: Fiber
3232
}
3333
};
3434

@@ -39,7 +39,7 @@ const TYPEDOC_THEME = {
3939
OUTPUT: slash(path.join(DOCS_OUTPUT_PATH, 'typescript'))
4040
};
4141

42-
module.exports.buildStyle = (cb) => {
42+
module.exports.buildStyle = () => {
4343
const prefixer = postcss([autoprefixer({
4444
cascade: false,
4545
grid: true
@@ -50,18 +50,16 @@ module.exports.buildStyle = (cb) => {
5050

5151
const myEventEmitter = new EventEmitter();
5252

53-
gulp.src(STYLES.SRC)
53+
return gulp.src(STYLES.SRC)
5454
.pipe(sourcemaps.init())
55-
.pipe(sass.sync(STYLES.CONFIG).on('error', err => {
55+
.pipe(sass(STYLES.CONFIG).on('error', err => {
5656
sass.logError.bind(myEventEmitter)(err);
5757
myEventEmitter.emit('end');
5858
process.exit(1);
5959
}))
6060
.pipe(prefixer)
6161
.pipe(sourcemaps.write(STYLES.MAPS))
62-
.pipe(gulp.dest(STYLES.DIST));
63-
64-
cb();
62+
.pipe(gulp.dest(STYLES.DIST))
6563
};
6664

6765
module.exports.copyGitHooks = async (cb) => {

0 commit comments

Comments
 (0)