Skip to content

Commit d6ac41f

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 65f2d2d commit d6ac41f

File tree

8 files changed

+107
-28
lines changed

8 files changed

+107
-28
lines changed

build/gulp/css.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ var cache = require('gulp-cached');
1010
var progeny = require('gulp-progeny');
1111

1212
var cleanCssOptions = {
13-
compatibility: 'ie7',
13+
compatibility: 'ie9',
1414
aggressiveMerging: false,
1515
advanced: false
1616
};
1717

1818
module.exports.fromLess = lazypipe()
1919
.pipe(logger, { after: 'LESS complete!', extname: '.css', showChange: true })
2020
.pipe(less, {
21-
strictMath: 'on',
22-
relativeUrls: true,
23-
plugins: []
21+
math: 'strict',
22+
relativeUrls: true,
23+
plugins: []
2424
})
2525
.pipe(replace, /\.\.\/mobile\//g, ''); // temp hack for the discrepancy between source and generated "source"
2626

docs/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ GEM
1414
extras (0.3.0)
1515
forwardable-extended (~> 2.5)
1616
fastimage (2.1.1)
17-
ffi (1.9.18-x64-mingw32)
17+
ffi (1.9.24-x64-mingw32)
1818
forwardable-extended (2.6.0)
1919
github-markdown (0.6.9)
2020
html-pipeline (1.9.0)

gulpfile.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,15 @@ var postcss = require("gulp-postcss");
4545
var autoprefixer = require("autoprefixer");
4646
var calc = require("postcss-calc");
4747
var browsers = [
48-
"Explorer >= 8",
48+
"Explorer >= 9",
4949
"last 3 Edge versions",
50-
"last 3 Chrome versions",
51-
"last 3 Firefox versions",
52-
"last 3 Opera versions",
53-
"last 3 Safari major versions",
54-
"Android >= 2.3",
55-
"ExplorerMobile >= 10",
56-
"iOS >= 6",
57-
"BlackBerry >= 10"
50+
"last 2 Chrome versions",
51+
"last 2 Firefox versions",
52+
"last 2 Opera versions",
53+
"last 2 Safari major versions",
54+
"last 2 iOS major versions",
55+
"Android >= 4.4",
56+
"ExplorerMobile >= 10"
5857
];
5958
var postcssPlugins = [
6059
calc({

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@progress/kendo-theme-default": "^2.0.0",
1616
"@progress/kendo-theme-material": "^1.0.0",
1717
"amd-optimize": "0.6.1",
18-
"autoprefixer": "^7.1.6",
18+
"autoprefixer": "^9.1.5",
1919
"bootstrap": "^4.0.0",
2020
"browser-sync": "~2.9.10",
2121
"colors": "^1.3.2",
@@ -36,11 +36,11 @@
3636
"gulp-if": "^2.0.0",
3737
"gulp-ignore": "^1.2.1",
3838
"gulp-insert": "^0.5.0",
39-
"gulp-jshint": "^1.11.2",
40-
"gulp-less": "~3.0.3",
39+
"gulp-jshint": "^2.1.0",
40+
"gulp-less": "^4.0.1",
4141
"gulp-logger": "~0.0.2",
4242
"gulp-plumber": "~1.0.1",
43-
"gulp-postcss": "^7.0.0",
43+
"gulp-postcss": "^8.0.0",
4444
"gulp-progeny": "~0.1.2",
4545
"gulp-rename": "^1.4.0",
4646
"gulp-replace": "~0.5.4",
@@ -53,18 +53,18 @@
5353
"gulp-zip": "^3.2.0",
5454
"is-absolute": "^0.1.7",
5555
"jshint": "2.8.0",
56-
"jshint-stylish": "~2.0.1",
56+
"jshint-stylish": "^2.2.1",
5757
"karma": "^1.3.0",
5858
"karma-chrome-launcher": "^2.0.0",
5959
"karma-firefox-launcher": "^1.0.0",
6060
"karma-html2js-preprocessor": "^1.1.0",
6161
"karma-junit-reporter": "^1.1.0",
6262
"karma-qunit": "^1.2.1",
6363
"lazypipe": "~1.0.1",
64-
"less": "2.6.1",
64+
"less": "^3.8.1",
6565
"merge2": "~0.3.6",
6666
"optimist": "0.3.7",
67-
"postcss": "^6.0.14",
67+
"postcss": "^7.0.2",
6868
"postcss-calc": "^6.0.1",
6969
"qunitjs": "1.19.0",
7070
"require-dir": "~0.3.0",

src/kendo.data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3901,7 +3901,7 @@ var __meta__ = { // jshint ignore:line
39013901
var that = this;
39023902

39033903
if (val !== undefined) {
3904-
that._query({ pageSize: val, page: 1 });
3904+
that._query(that._pageableQueryOptions({ pageSize: val, page: 1 }));
39053905
return;
39063906
}
39073907

src/kendo.multiselect.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,10 @@ var __meta__ = { // jshint ignore:line
769769
var dir = 0;
770770
var activeItemIdx;
771771

772+
if(key !== keys.ENTER) {
773+
this._multipleSelection = false;
774+
}
775+
772776
if (key === keys.DOWN) {
773777
e.preventDefault();
774778

@@ -793,6 +797,7 @@ var __meta__ = { // jshint ignore:line
793797
listView.focusLast();
794798
} else {
795799
if (e.shiftKey) {
800+
this._multipleSelection = true;
796801
that._selectRange(activeItemIdx, listView.getElementIndex(listView.focus()[0]) + dir);
797802
}
798803
}
@@ -812,6 +817,7 @@ var __meta__ = { // jshint ignore:line
812817
that.close();
813818
} else {
814819
if (e.shiftKey) {
820+
this._multipleSelection = true;
815821
that._selectRange(activeItemIdx, listView.getElementIndex(listView.focus()[0]) + dir);
816822
}
817823
}
@@ -830,6 +836,7 @@ var __meta__ = { // jshint ignore:line
830836
that.currentTag(tag[0] ? tag : null);
831837
}
832838
} else if (e.ctrlKey && !e.altKey && key === keys.A && visible) {
839+
this._multipleSelection = true;
833840
if (this._getSelectedIndices().length === listView.items().length) {
834841
that._activeItem = null;
835842
}
@@ -843,12 +850,15 @@ var __meta__ = { // jshint ignore:line
843850
}
844851

845852
e.preventDefault();
846-
847-
if (listView.focus().hasClass(SELECTEDCLASS)) {
848-
that._close();
849-
return;
853+
854+
if (this._multipleSelection) {
855+
this._multipleSelection = false;
856+
if (listView.focus().hasClass(SELECTEDCLASS)) {
857+
that._close();
858+
return;
859+
}
850860
}
851-
861+
852862
that._select(listView.focus()).done(function() {
853863
that._change();
854864
that._close();

tests/multiselect/navigation.js

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,76 @@
274274
equal(multiselect.tagList.children().eq(1).text().indexOf("Option2"), 0);
275275
});
276276

277+
test("MultiSelect selects multiple items on SHIFT+DOWN and enter", 3, function () {
278+
var multiselect = new MultiSelect(select);
279+
280+
multiselect.open();
281+
282+
multiselect.input.trigger({
283+
type: "keydown",
284+
keyCode: keys.DOWN
285+
});
286+
287+
multiselect.input.trigger({
288+
type: "keydown",
289+
keyCode: keys.DOWN,
290+
shiftKey: true
291+
});
292+
293+
multiselect.input.trigger({
294+
type: "keydown",
295+
keyCode: keys.DOWN,
296+
shiftKey: true
297+
});
298+
299+
multiselect.input.trigger({
300+
type: "keydown",
301+
keyCode: keys.ENTER,
302+
});
303+
304+
equal(multiselect.tagList.children().length, 2);
305+
equal(multiselect.tagList.children().eq(0).text().indexOf("Option1"), 0);
306+
equal(multiselect.tagList.children().eq(1).text().indexOf("Option2"), 0);
307+
});
308+
309+
test("MultiSelect selects multiple items on SHIFT+DOWN then and enter", 4, function () {
310+
var multiselect = new MultiSelect(select);
311+
312+
multiselect.open();
313+
314+
multiselect.input.trigger({
315+
type: "keydown",
316+
keyCode: keys.DOWN
317+
});
318+
319+
multiselect.input.trigger({
320+
type: "keydown",
321+
keyCode: keys.DOWN,
322+
shiftKey: true
323+
});
324+
325+
multiselect.input.trigger({
326+
type: "keydown",
327+
keyCode: keys.DOWN,
328+
shiftKey: true
329+
});
330+
331+
multiselect.input.trigger({
332+
type: "keydown",
333+
keyCode: keys.DOWN
334+
});
335+
336+
multiselect.input.trigger({
337+
type: "keydown",
338+
keyCode: keys.ENTER,
339+
});
340+
341+
equal(multiselect.tagList.children().length, 3);
342+
equal(multiselect.tagList.children().eq(0).text().indexOf("Option1"), 0);
343+
equal(multiselect.tagList.children().eq(1).text().indexOf("Option2"), 0);
344+
equal(multiselect.tagList.children().eq(2).text().indexOf("Option3"), 0);
345+
});
346+
277347
test("MultiSelect respects maxSelectedItems on SHIFT+DOWN", 2, function () {
278348
var multiselect = new MultiSelect(select, {
279349
maxSelectedItems: 1

typescript/kendo.all.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4370,7 +4370,7 @@ declare namespace kendo.ui {
43704370
scrollable?: boolean | GridScrollable;
43714371
selectable?: boolean|string;
43724372
sortable?: boolean | GridSortable;
4373-
toolbar?: GridToolbarItem[];
4373+
toolbar?: (string|GridToolbarItem)[];
43744374
beforeEdit?(e: GridBeforeEditEvent): void;
43754375
cancel?(e: GridCancelEvent): void;
43764376
cellClose?(e: GridCellCloseEvent): void;

0 commit comments

Comments
 (0)