Skip to content

Commit

Permalink
7f33f33c706e39113d37f2b0cd5dce731e9a564f Dev: Fallback to window for …
Browse files Browse the repository at this point in the history
…BS/F libraries, which can still be undefined

Sync to source repo @7f33f33c706e39113d37f2b0cd5dce731e9a564f
  • Loading branch information
dtbuild committed Oct 24, 2024
1 parent d27563c commit 97113f6
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion datatables.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
],
"src-repo": "http://github.com/DataTables/DataTablesSrc",
"last-tag": "2.1.8",
"last-sync": "3396fc6ed6ff6be2346e557b89383a69e4813c6f"
"last-sync": "7f33f33c706e39113d37f2b0cd5dce731e9a564f"
}
6 changes: 4 additions & 2 deletions js/dataTables.js
Original file line number Diff line number Diff line change
Expand Up @@ -9441,10 +9441,12 @@
return __moment;

case 'bootstrap':
return __bootstrap;
// Use local if set, otherwise try window, which could be undefined
return __bootstrap || window.bootstrap;

case 'foundation':
return __foundation;
// Ditto
return __foundation || window.Foundation;

default:
return null;
Expand Down
2 changes: 1 addition & 1 deletion js/dataTables.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/dataTables.min.mjs

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions js/dataTables.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9388,10 +9388,12 @@ DataTable.use = function (arg1, arg2) {
return __moment;

case 'bootstrap':
return __bootstrap;
// Use local if set, otherwise try window, which could be undefined
return __bootstrap || window.bootstrap;

case 'foundation':
return __foundation;
// Ditto
return __foundation || window.Foundation;

default:
return null;
Expand Down

0 comments on commit 97113f6

Please sign in to comment.