Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 464ae31

Browse filesBrowse files
author
Armando Aguirre
authored
Merge pull request microsoft#20082 from armanio123/KendoOptionalMin
Modified Kendo regex to include -ui folders and files without min
2 parents 9992395 + 49c169a commit 464ae31
Copy full SHA for 464ae31

3 files changed

+7-3Lines changed: 7 additions & 3 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/harness/unittests/tsserverProjectSystem.ts‎

Copy file name to clipboardExpand all lines: src/harness/unittests/tsserverProjectSystem.ts
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1518,6 +1518,10 @@ namespace ts.projectSystem {
15181518
path: "/q/lib/kendo/kendo.ui.min.js",
15191519
content: "unspecified"
15201520
};
1521+
const kendoFile3 = {
1522+
path: "/q/lib/kendo-ui/kendo.all.js",
1523+
content: "unspecified"
1524+
};
15211525
const officeFile1 = {
15221526
path: "/scripts/Office/1/excel-15.debug.js",
15231527
content: "unspecified"
@@ -1526,7 +1530,7 @@ namespace ts.projectSystem {
15261530
path: "/scripts/Office/1/powerpoint.js",
15271531
content: "unspecified"
15281532
};
1529-
const files = [file1, minFile, kendoFile1, kendoFile2, officeFile1, officeFile2];
1533+
const files = [file1, minFile, kendoFile1, kendoFile2, kendoFile3, officeFile1, officeFile2];
15301534
const host = createServerHost(files);
15311535
const projectService = createProjectService(host);
15321536
try {
Collapse file

‎src/server/editorServices.ts‎

Copy file name to clipboardExpand all lines: src/server/editorServices.ts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ namespace ts.server {
145145
},
146146
"Kendo": {
147147
// e.g. /Kendo3/wwwroot/lib/kendo/kendo.all.min.js
148-
match: /^(.*\/kendo)\/kendo\.all\.min\.js$/i,
148+
match: /^(.*\/kendo(-ui)?)\/kendo\.all(\.min)?\.js$/i,
149149
exclude: [["^", 1, "/.*"]],
150150
types: ["kendo-ui"]
151151
},
Collapse file

‎src/server/typesMap.json‎

Copy file name to clipboardExpand all lines: src/server/typesMap.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"types": ["winjs"]
1111
},
1212
"Kendo": {
13-
"match": "^(.*\\/kendo)\\/kendo\\.all\\.min\\.js$",
13+
"match": "^(.*\\/kendo(-ui)?)\\/kendo\\.all(\\.min)?\\.js$",
1414
"exclude": [["^", 1, "/.*"]],
1515
"types": ["kendo-ui"]
1616
},

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.