From f031836b1da8e680203addd122ec20ff98822e06 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Wed, 18 Jun 2014 14:32:02 +0200 Subject: [PATCH 1/2] Bower.json for bootstrap3 --- bower.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..8025be3 --- /dev/null +++ b/bower.json @@ -0,0 +1,11 @@ +{ + "name": "datatables.plugins", + "version": "0.1", + "main": [ + "integration/bootstrap/3/dataTables.bootstrap.css", + "integration/bootstrap/3/dataTables.bootstrap.js" + ], + "dependencies": { + "datatables": ">=1.10" + } +} From 4046e323d17a9d900c4275de65b2a2be458e960f Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Wed, 18 Jun 2014 14:34:59 +0200 Subject: [PATCH 2/2] AMDification of dataTables.bootstrap.js For bootstrap 3 only --- integration/bootstrap/3/dataTables.bootstrap.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/integration/bootstrap/3/dataTables.bootstrap.js b/integration/bootstrap/3/dataTables.bootstrap.js index de5177f..70f1da0 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.js +++ b/integration/bootstrap/3/dataTables.bootstrap.js @@ -1,3 +1,12 @@ +(function(o_o) { + if (typeof define === 'function' && define.amd) { + require(['jquery', 'datatables'], function($) { o_o($) }) + } else { + o_o(window.jQuery) + } +}(function($) { + + /* Set the defaults for DataTables initialisation */ $.extend( true, $.fn.dataTable.defaults, { "sDom": @@ -249,3 +258,4 @@ if ( $.fn.DataTable.TableTools ) { } ); } +}));