Skip to content

Commit cd12c8b

Browse files
author
Armando Aguirre
committed
Added datatables library to safelist
1 parent 6fadd48 commit cd12c8b

3 files changed

Lines changed: 24 additions & 2 deletions

File tree

src/harness/unittests/tsserverProjectSystem.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,14 +1541,27 @@ namespace ts.projectSystem {
15411541
path: "/scripts/Office/1/powerpoint.js",
15421542
content: "unspecified"
15431543
};
1544-
const files = [file1, minFile, kendoFile1, kendoFile2, kendoFile3, officeFile1, officeFile2];
1544+
const datatablesFile1 = {
1545+
path: "/js/jquery.datatables.js",
1546+
content: "unspecified"
1547+
};
1548+
const datatablesFile2 = {
1549+
path: "/js/datatables.js",
1550+
content: "unspecified"
1551+
};
1552+
const datatablesFile3 = {
1553+
path: "/js/datatables.all.min.js",
1554+
content: "unspecified"
1555+
};
1556+
1557+
const files = [file1, minFile, kendoFile1, kendoFile2, kendoFile3, officeFile1, officeFile2, datatablesFile1, datatablesFile2, datatablesFile3];
15451558
const host = createServerHost(files);
15461559
const projectService = createProjectService(host);
15471560
try {
15481561
projectService.openExternalProject({ projectFileName: "project", options: {}, rootFiles: toExternalFiles(files.map(f => f.path)) });
15491562
const proj = projectService.externalProjects[0];
15501563
assert.deepEqual(proj.getFileNames(/*excludeFilesFromExternalLibraries*/ true), [file1.path]);
1551-
assert.deepEqual(proj.getTypeAcquisition().include, ["kendo-ui", "office"]);
1564+
assert.deepEqual(proj.getTypeAcquisition().include, ["kendo-ui", "office", "datatables.net"]);
15521565
} finally {
15531566
projectService.resetSafeList();
15541567
}

src/server/editorServices.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@ namespace ts.server {
158158
"References": {
159159
match: /^(.*\/_references\.js)$/i,
160160
exclude: [["^", 1, "$"]]
161+
},
162+
"Datatables.net": {
163+
// e.g. /wwwroot/lib/datatables.all.min.js
164+
match: /(jquery\.)*dataTables(\.all)*(\.min)*\.js$/i,
165+
types: ["datatables.net"]
161166
}
162167
};
163168

src/server/typesMap.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
"References": {
2323
"match": "^(.*\\/_references\\.js)$",
2424
"exclude": [["^", 1, "$"]]
25+
},
26+
"Datatables.net": {
27+
"match": "(jquery\\.)*dataTables(\\.all)*(\\.min)*\\.js$",
28+
"types": ["datatables.net"]
2529
}
2630
},
2731
"simpleMap": {

0 commit comments

Comments
 (0)