Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions build/wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,19 @@ ${exportProps}
function umd(script, deps, exp, filename) {
let amdLoad = [];
let commonjs = [];
let commonjsrequires = "";
let requiresDT = false;

commonjsmodules = "{" + deps.map((dep) => {
return `'${dep}': require('${dep}')`;
}).join(",") + "}";
for (let dep of deps) {
amdLoad.push(`'${dep}'`);

if (nameFromDependency(dep) === 'DataTable') {
commonjs.push(`
if (! root.DataTable) {
require('${dep}')(root);
root.DataTable = cjsModules['${dep}'](root);
}
`);

Expand All @@ -183,8 +187,9 @@ function umd(script, deps, exp, filename) {
let name = nameFromDependency(dep);

commonjs.push(`
if (! window.DataTable.${name}) {
require('${dep}')(root);
baseModule['${dep}'] = require('${dep}');
if (! root.DataTable.${name}) {
root.DataTable.${name} = cjsModules['${dep}'](root);
}
`);
}
Expand Down Expand Up @@ -221,6 +226,7 @@ function umd(script, deps, exp, filename) {
}
else if (typeof exports === 'object') {
// CommonJS
var cjsModules = ${commonjsmodules};
var cjsRequires = function (root) {${commonjs.join('')} };

if (typeof window === 'undefined') {
Expand Down
2 changes: 1 addition & 1 deletion js/util/ajax.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const defaults = {
contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
headers: {},
traditional: false,
url: location.href
url: window.location.href
} as AjaxOptions;

/**
Expand Down