Skip to content

Commit 6bcf324

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 3b5e665 commit 6bcf324

File tree

364 files changed

+80281
-89230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+80281
-89230
lines changed

‎build/gulp/tasks/karma.js‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ TESTS.beforeTestFiles.push('tests/jasmine-boot.js');
4646
var defaultOptions = {
4747
reportSlowerThan: 500,
4848
basePath: '',
49-
frameworks: ['qunit'],
49+
frameworks: ['mocha', 'chai'],
5050
preprocessors: {
5151
'tests/**/.html': [],
5252
'tests/**/*-fixture.html': ['html2js']
5353
},
54-
reporters: ['progress'],
54+
reporters: ['spec'],
5555
colors: true,
5656
autoWatch: true,
5757
browsers: browsers,
@@ -61,7 +61,11 @@ var defaultOptions = {
6161
flags: ['--no-sandbox']
6262
}
6363
},
64-
64+
client: {
65+
mocha: {
66+
timeout: 10000
67+
}
68+
},
6569
junitReporter: {
6670
outputDir: '.',
6771
outputFile: argv['junit-results']
@@ -98,26 +102,13 @@ var flavours = {
98102
)
99103
},
100104

101-
unit: {
105+
mocha: {
102106
files: [].concat(
103107
TESTS.beforeTestFiles,
104108
allKendoFiles,
105109
TESTS.afterTestFiles,
106110
tests
107111
)
108-
},
109-
110-
legacyUnit: {
111-
browsers: browserOption ? [ browserOption ] : [],
112-
113-
files: [].concat(
114-
TESTS.beforeTestFiles,
115-
allKendoFiles,
116-
TESTS.afterTestFiles,
117-
tests
118-
).filter(function(x) {
119-
return !/(themeuilder|less)\.js|angular/i.test(x);
120-
})
121112
}
122113
};
123114

‎gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ gulp.task("jshint", function() {
225225

226226
gulp.task('build', [ 'scripts', 'styles' ]);
227227

228-
gulp.task('tests', [ 'karma-unit' ]);
228+
gulp.task('tests', [ 'karma-mocha' ]);
229229

230230
gulp.task('ci', function(done) {
231231
runSequence('build', 'karma-jenkins', done);

‎package.json‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"autoprefixer": "^9.1.5",
1919
"bootstrap": "^4.0.0",
2020
"browser-sync": "~2.9.10",
21-
"chai": "^4.1.2",
2221
"colors": "^1.3.2",
2322
"cookiejar": "1.3.0",
2423
"cz-conventional-changelog": "1.2.0",
@@ -56,18 +55,14 @@
5655
"jshint": "2.8.0",
5756
"jshint-stylish": "^2.2.1",
5857
"karma": "^1.3.0",
59-
"karma-chai": "^0.1.0",
6058
"karma-chrome-launcher": "^2.0.0",
6159
"karma-firefox-launcher": "^1.0.0",
6260
"karma-html2js-preprocessor": "^1.1.0",
6361
"karma-junit-reporter": "^1.1.0",
64-
"karma-mocha": "^1.3.0",
6562
"karma-qunit": "^1.2.1",
66-
"karma-spec-reporter": "0.0.32",
6763
"lazypipe": "~1.0.1",
6864
"less": "^3.8.1",
6965
"merge2": "~0.3.6",
70-
"mocha": "^5.2.0",
7166
"optimist": "0.3.7",
7267
"postcss": "^7.0.2",
7368
"postcss-calc": "^6.0.1",
@@ -103,13 +98,9 @@
10398
"nonew": true,
10499
"globals": {
105100
"JSON": true,
106-
"Mocha": true,
101+
"QUnit": true,
107102
"Promise": true,
108103
"Symbol": true,
109-
"assert": true,
110-
"describe": true,
111-
"beforeEach": true,
112-
"afterEach": true,
113104
"test": true,
114105
"asyncTest": true,
115106
"module": true,

‎styles/web/Default/multiviewcalendar/_layout.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
margin: 0 -1px;
224224

225225
.k-link {
226+
padding: @multiviewcalendar-centuryview-cell-padding-y @multiviewcalendar-centuryview-cell-padding-x;
226227
width: @calendar-meta-cell-size;
227228
height: @calendar-meta-cell-size;
228229
text-align: left;

‎styles/web/kendo.common-bootstrap.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108
@multiviewcalendar-cell-line-height: @calendar-cell-line-height;
109109
@multiviewcalendar-cell-size: @calendar-cell-size;
110110

111+
@multiviewcalendar-centuryview-cell-padding-x: @multiviewcalendar-cell-padding-x;
112+
@multiviewcalendar-centuryview-cell-padding-y: @multiviewcalendar-cell-padding-y;
113+
111114
@multiviewcalendar-header-cell-font-size: 12px;
112115

113116
// ScrollView

‎styles/web/kendo.common-fiori.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108
@multiviewcalendar-cell-line-height: @calendar-cell-line-height;
109109
@multiviewcalendar-cell-size: @calendar-cell-size;
110110

111+
@multiviewcalendar-centuryview-cell-padding-x: (@multiviewcalendar-cell-padding-x / 2);
112+
@multiviewcalendar-centuryview-cell-padding-y: (@multiviewcalendar-cell-padding-y / 2);
113+
111114
@multiviewcalendar-header-cell-font-size: 12px;
112115

113116
// ScrollView

‎styles/web/kendo.common-material.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@
109109
@multiviewcalendar-cell-line-height: @calendar-cell-line-height;
110110
@multiviewcalendar-cell-size: @calendar-cell-size;
111111

112+
@multiviewcalendar-centuryview-cell-padding-x: @multiviewcalendar-cell-padding-x;
113+
@multiviewcalendar-centuryview-cell-padding-y: @multiviewcalendar-cell-padding-y;
114+
112115
@multiviewcalendar-header-cell-font-size: 12px;
113116

114117
// ScrollView

‎styles/web/kendo.common-nova.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@
111111
@multiviewcalendar-cell-line-height: @calendar-cell-line-height;
112112
@multiviewcalendar-cell-size: @calendar-cell-size;
113113

114+
@multiviewcalendar-centuryview-cell-padding-x: @multiviewcalendar-cell-padding-x;
115+
@multiviewcalendar-centuryview-cell-padding-y: @multiviewcalendar-cell-padding-y;
116+
114117
@multiviewcalendar-header-cell-font-size: 12px;
115118

116119
@spreadsheet-popup-button-padding: .6em 1.2em .6em 1em;

‎styles/web/kendo.common-office365.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108
@multiviewcalendar-cell-line-height: @calendar-cell-line-height;
109109
@multiviewcalendar-cell-size: @calendar-cell-size;
110110

111+
@multiviewcalendar-centuryview-cell-padding-x: (.8 * @multiviewcalendar-cell-padding-x);
112+
@multiviewcalendar-centuryview-cell-padding-y: (.8 * @multiviewcalendar-cell-padding-y);
113+
111114
@multiviewcalendar-header-cell-font-size: 12px;
112115

113116
// ScrollView

‎styles/web/kendo.common.less‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108
@multiviewcalendar-cell-line-height: @calendar-cell-line-height;
109109
@multiviewcalendar-cell-size: @calendar-cell-size;
110110

111+
@multiviewcalendar-centuryview-cell-padding-x: @multiviewcalendar-cell-padding-x;
112+
@multiviewcalendar-centuryview-cell-padding-y: @multiviewcalendar-cell-padding-y;
113+
111114
@multiviewcalendar-header-cell-font-size: 12px;
112115

113116
// ScrollView

0 commit comments

Comments
 (0)