Update: Updating the AMD and CommonJS loaders

- Cannot pass in a `dt` instance - will always use the one from the
  jQuery instance given
- Don't check for reinitialisation or for jQuery when working in the
  browser - will throw an error if in browser and no jQuery, which is
  correct, DataTables needs jQuery

.datatables-commit-sync

@@ -1 +1 @@
-de61014af48ec511ce3b384209f4d8c709f091a0
+f8977ef80e43dda4d2d8623f05e16b047d22478a

media/js/dataTables.bootstrap.js

@@ -16,18 +16,21 @@
 		define( ['jquery', 'datatables'], factory );
 	}
 	else if ( typeof exports === 'object' ) {
-		// Node / CommonJS
+		// CommonJS
-		module.exports = function ($, dt) {
+		module.exports = function ($) {
 			if ( ! $ ) { $ = require('jquery'); }
-			factory( $, dt || $.fn.dataTable || require('datatables') );
+			if ( ! $.fn.dataTable ) { require('datatables')($); }
+
+			factory( $ );
 		};
 	}
-	else if ( jQuery ) {
+	else {
-		// Browser standard
+		// Browser
-		factory( jQuery, jQuery.fn.dataTable );
+		factory( jQuery );
 	}
-}(function( $, DataTable ) {
+}(function( $ ) {
 'use strict';
+var DataTable = $.fn.dataTable;
 
 
 /* Set the defaults for DataTables initialisation */

media/js/dataTables.bootstrap.min.js

@@ -2,8 +2,8 @@
  DataTables Bootstrap 3 integration
  ©2011-2015 SpryMedia Ltd - datatables.net/license
 */
-(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables"],b):"object"===typeof exports?module.exports=function(a,d){a||(a=require("jquery"));b(a,d||a.fn.dataTable||require("datatables"))}:jQuery&&b(jQuery,jQuery.fn.dataTable)})(function(b,a){b.extend(!0,a.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(a.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",
+(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables"],b):"object"===typeof exports?module.exports=function(a){a||(a=require("jquery"));a.fn.dataTable||require("datatables")(a);b(a)}:b(jQuery)})(function(b){var a=b.fn.dataTable;b.extend(!0,a.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(a.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",
-sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});a.ext.renderer.pageButton.bootstrap=function(d,g,r,l,i,m){var n=new a.Api(d),s=d.oClasses,j=d.oLanguage.oPaginate,e,f,o=0,q=function(a,g){var k,h,p,c,l=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&n.page()!=a.data.action&&n.page(a.data.action).draw("page")};k=0;for(h=g.length;k<h;k++)if(c=g[k],b.isArray(c))q(a,c);else{f=e="";switch(c){case "ellipsis":e="&hellip;";f="disabled";
+sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});a.ext.renderer.pageButton.bootstrap=function(f,g,r,l,i,m){var n=new a.Api(f),s=f.oClasses,j=f.oLanguage.oPaginate,d,e,o=0,q=function(a,g){var k,h,p,c,l=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&n.page()!=a.data.action&&n.page(a.data.action).draw("page")};k=0;for(h=g.length;k<h;k++)if(c=g[k],b.isArray(c))q(a,c);else{e=d="";switch(c){case "ellipsis":d="&hellip;";e="disabled";
-break;case "first":e=j.sFirst;f=c+(0<i?"":" disabled");break;case "previous":e=j.sPrevious;f=c+(0<i?"":" disabled");break;case "next":e=j.sNext;f=c+(i<m-1?"":" disabled");break;case "last":e=j.sLast;f=c+(i<m-1?"":" disabled");break;default:e=c+1,f=i===c?"active":""}e&&(p=b("<li>",{"class":s.sPageButton+" "+f,id:0===r&&"string"===typeof c?d.sTableId+"_"+c:null}).append(b("<a>",{href:"#","aria-controls":d.sTableId,"data-dt-idx":o,tabindex:d.iTabIndex}).html(e)).appendTo(a),d.oApi._fnBindAction(p,{action:c},
+break;case "first":d=j.sFirst;e=c+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;e=c+(0<i?"":" disabled");break;case "next":d=j.sNext;e=c+(i<m-1?"":" disabled");break;case "last":d=j.sLast;e=c+(i<m-1?"":" disabled");break;default:d=c+1,e=i===c?"active":""}d&&(p=b("<li>",{"class":s.sPageButton+" "+e,id:0===r&&"string"===typeof c?f.sTableId+"_"+c:null}).append(b("<a>",{href:"#","aria-controls":f.sTableId,"data-dt-idx":o,tabindex:f.iTabIndex}).html(d)).appendTo(a),f.oApi._fnBindAction(p,{action:c},
 l),o++)}},h;try{h=b(g).find(document.activeElement).data("dt-idx")}catch(t){}q(b(g).empty().html('<ul class="pagination"/>').children("ul"),l);h&&b(g).find("[data-dt-idx="+h+"]").focus()};a.TableTools&&(b.extend(!0,a.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,a.TableTools.DEFAULTS.oTags,
 {collection:{container:"ul",button:"li",liner:"a"}}));return a});

media/js/dataTables.foundation.js

@@ -16,18 +16,21 @@
 		define( ['jquery', 'datatables'], factory );
 	}
 	else if ( typeof exports === 'object' ) {
-		// Node / CommonJS
+		// CommonJS
-		module.exports = function ($, dt) {
+		module.exports = function ($) {
 			if ( ! $ ) { $ = require('jquery'); }
-			factory( $, dt || $.fn.dataTable || require('datatables') );
+			if ( ! $.fn.dataTable ) { require('datatables')($); }
+
+			factory( $ );
 		};
 	}
-	else if ( jQuery ) {
+	else {
-		// Browser standard
+		// Browser
-		factory( jQuery, jQuery.fn.dataTable );
+		factory( jQuery );
 	}
-}(function( $, DataTable ) {
+}(function( $ ) {
 'use strict';
+var DataTable = $.fn.dataTable;
 
 
 $.extend( DataTable.ext.classes, {

media/js/dataTables.foundation.min.js

@@ -2,6 +2,6 @@
  DataTables Foundation integration
  ©2011-2015 SpryMedia Ltd - datatables.net/license
 */
-(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables"],c):"object"===typeof exports?module.exports=function(a,d){a||(a=require("jquery"));c(a,d||a.fn.dataTable||require("datatables"))}:jQuery&&c(jQuery,jQuery.fn.dataTable)})(function(c,a){c.extend(a.ext.classes,{sWrapper:"dataTables_wrapper dt-foundation",sProcessing:"dataTables_processing panel"});c.extend(!0,a.defaults,{dom:"<'row'<'small-6 columns'l><'small-6 columns'f>r>t<'row'<'small-6 columns'i><'small-6 columns'p>>",
+(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables"],c):"object"===typeof exports?module.exports=function(a){a||(a=require("jquery"));a.fn.dataTable||require("datatables")(a);c(a)}:c(jQuery)})(function(c){var a=c.fn.dataTable;c.extend(a.ext.classes,{sWrapper:"dataTables_wrapper dt-foundation",sProcessing:"dataTables_processing panel"});c.extend(!0,a.defaults,{dom:"<'row'<'small-6 columns'l><'small-6 columns'f>r>t<'row'<'small-6 columns'i><'small-6 columns'p>>",renderer:"foundation"});
-renderer:"foundation"});a.ext.renderer.pageButton.foundation=function(d,j,q,r,g,k){var l=new a.Api(d),s=d.oClasses,h=d.oLanguage.oPaginate,e,f,p=function(a,m){var i,n,o,b,j=function(a){a.preventDefault();!c(a.currentTarget).hasClass("unavailable")&&l.page()!=a.data.action&&l.page(a.data.action).draw("page")};i=0;for(n=m.length;i<n;i++)if(b=m[i],c.isArray(b))p(a,b);else{f=e="";switch(b){case "ellipsis":e="&hellip;";f="unavailable";break;case "first":e=h.sFirst;f=b+(0<g?"":" unavailable");break;case "previous":e=
+a.ext.renderer.pageButton.foundation=function(f,j,q,r,g,k){var l=new a.Api(f),s=f.oClasses,h=f.oLanguage.oPaginate,d,e,p=function(a,m){var i,n,o,b,j=function(a){a.preventDefault();!c(a.currentTarget).hasClass("unavailable")&&l.page()!=a.data.action&&l.page(a.data.action).draw("page")};i=0;for(n=m.length;i<n;i++)if(b=m[i],c.isArray(b))p(a,b);else{e=d="";switch(b){case "ellipsis":d="&hellip;";e="unavailable";break;case "first":d=h.sFirst;e=b+(0<g?"":" unavailable");break;case "previous":d=h.sPrevious;
-h.sPrevious;f=b+(0<g?"":" unavailable");break;case "next":e=h.sNext;f=b+(g<k-1?"":" unavailable");break;case "last":e=h.sLast;f=b+(g<k-1?"":" unavailable");break;default:e=b+1,f=g===b?"current":""}e&&(o=c("<li>",{"class":s.sPageButton+" "+f,"aria-controls":d.sTableId,tabindex:d.iTabIndex,id:0===q&&"string"===typeof b?d.sTableId+"_"+b:null}).append(c("<a>",{href:"#"}).html(e)).appendTo(a),d.oApi._fnBindAction(o,{action:b},j))}};p(c(j).empty().html('<ul class="pagination"/>').children("ul"),r)};return a});
+e=b+(0<g?"":" unavailable");break;case "next":d=h.sNext;e=b+(g<k-1?"":" unavailable");break;case "last":d=h.sLast;e=b+(g<k-1?"":" unavailable");break;default:d=b+1,e=g===b?"current":""}d&&(o=c("<li>",{"class":s.sPageButton+" "+e,"aria-controls":f.sTableId,tabindex:f.iTabIndex,id:0===q&&"string"===typeof b?f.sTableId+"_"+b:null}).append(c("<a>",{href:"#"}).html(d)).appendTo(a),f.oApi._fnBindAction(o,{action:b},j))}};p(c(j).empty().html('<ul class="pagination"/>').children("ul"),r)};return a});

media/js/dataTables.jqueryui.js

@@ -16,18 +16,21 @@
 		define( ['jquery', 'datatables'], factory );
 	}
 	else if ( typeof exports === 'object' ) {
-		// Node / CommonJS
+		// CommonJS
-		module.exports = function ($, dt) {
+		module.exports = function ($) {
 			if ( ! $ ) { $ = require('jquery'); }
-			factory( $, dt || $.fn.dataTable || require('datatables') );
+			if ( ! $.fn.dataTable ) { require('datatables')($); }
+
+			factory( $ );
 		};
 	}
 	else if ( jQuery ) {
-		// Browser standard
+		// Browser
-		factory( jQuery, jQuery.fn.dataTable );
+		factory( jQuery );
 	}
-}(function( $, DataTable ) {
+}(function( $ ) {
 'use strict';
+var DataTable = $.fn.dataTable;
 
 
 var sort_prefix = 'css_right ui-icon ui-icon-';

media/js/dataTables.jqueryui.min.js

@@ -2,7 +2,7 @@
  DataTables jQuery UI integration
  ©2011-2014 SpryMedia Ltd - datatables.net/license
 */
-(function(a){"function"===typeof define&&define.amd?define(["jquery","datatables"],a):"object"===typeof exports?module.exports=function(b,j){b||(b=require("jquery"));a(b,j||b.fn.dataTable||require("datatables"))}:jQuery&&a(jQuery,jQuery.fn.dataTable)})(function(a,b){a.extend(!0,b.defaults,{dom:'<"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-tl ui-corner-tr"lfr>t<"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-bl ui-corner-br"ip>',renderer:"jqueryui"});a.extend(b.ext.classes,
+(function(a){"function"===typeof define&&define.amd?define(["jquery","datatables"],a):"object"===typeof exports?module.exports=function(b){b||(b=require("jquery"));b.fn.dataTable||require("datatables")(b);a(b)}:jQuery&&a(jQuery)})(function(a){var b=a.fn.dataTable;a.extend(!0,b.defaults,{dom:'<"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-tl ui-corner-tr"lfr>t<"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-bl ui-corner-br"ip>',renderer:"jqueryui"});a.extend(b.ext.classes,
 {sWrapper:"dataTables_wrapper dt-jqueryui",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"ui-state-disabled",sPageButtonDisabled:"ui-state-disabled",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sSortAsc:"ui-state-default sorting_asc",sSortDesc:"ui-state-default sorting_desc",sSortable:"ui-state-default sorting",sSortableAsc:"ui-state-default sorting_asc_disabled",sSortableDesc:"ui-state-default sorting_desc_disabled",
 sSortableNone:"ui-state-default sorting_disabled",sSortIcon:"DataTables_sort_icon",sScrollHead:"dataTables_scrollHead ui-state-default",sScrollFoot:"dataTables_scrollFoot ui-state-default",sHeaderTH:"ui-state-default",sFooterTH:"ui-state-default"});b.ext.renderer.header.jqueryui=function(b,g,d,c){var e="css_right ui-icon ui-icon-carat-2-n-s",f=-1!==a.inArray("asc",d.asSorting),h=-1!==a.inArray("desc",d.asSorting);!d.bSortable||!f&&!h?e="":f&&!h?e="css_right ui-icon ui-icon-carat-1-n":!f&&h&&(e="css_right ui-icon ui-icon-carat-1-s");
 a("<div/>").addClass("DataTables_sort_wrapper").append(g.contents()).append(a("<span/>").addClass(c.sSortIcon+" "+e)).appendTo(g);a(b.nTable).on("order.dt",function(a,f,h,i){b===f&&(a=d.idx,g.removeClass(c.sSortAsc+" "+c.sSortDesc).addClass("asc"==i[a]?c.sSortAsc:"desc"==i[a]?c.sSortDesc:d.sSortingClass),g.find("span."+c.sSortIcon).removeClass("css_right ui-icon ui-icon-triangle-1-n css_right ui-icon ui-icon-triangle-1-s css_right ui-icon ui-icon-carat-2-n-s css_right ui-icon ui-icon-carat-1-n css_right ui-icon ui-icon-carat-1-s").addClass("asc"==

media/js/jquery.dataTables.js

@@ -30,19 +30,18 @@
 	"use strict";
 
 	if ( typeof define === 'function' && define.amd ) {
-		// Define as an AMD module if possible
+		// AMD
 		define( ['jquery'], factory );
 	}
 	else if ( typeof exports === 'object' ) {
-		// Node/CommonJS
+		// CommonJS
 		module.exports = function ($) {
 			// Get jQuery if it wasn't passed in
 			return factory( $ || require('jquery') );
 		};
 	}
-	else if ( jQuery && !jQuery.fn.dataTable ) {
+	else {
-		// Define using browser globals otherwise
+		// Browser
-		// Prevent multiple instantiations if the script is loaded twice
 		factory( jQuery );
 	}
 }

media/js/jquery.dataTables.min.js

@@ -160,5 +160,5 @@ g[e]=="desc"?d.sSortJUIDesc:c.sSortingClassJUI)}})}}});k.render={number:function
 _fnColumnOptions:la,_fnAdjustColumnSizing:Y,_fnVisibleToColumnIndex:$,_fnColumnIndexToVisible:ba,_fnVisbleColumns:ca,_fnGetColumns:aa,_fnColumnTypes:Ia,_fnApplyColumnDefs:hb,_fnHungarianMap:X,_fnCamelToHungarian:H,_fnLanguageCompat:S,_fnBrowserDetect:fb,_fnAddData:L,_fnAddTr:ma,_fnNodeToDataIndex:function(a,b){return b._DT_RowIndex!==l?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return g.inArray(c,a.aoData[b].anCells)},_fnGetCellData:B,_fnSetCellData:ib,_fnSplitObjNotation:La,_fnGetObjectDataFn:P,
 _fnSetObjectDataFn:Q,_fnGetDataMaster:Ma,_fnClearTable:na,_fnDeleteIndex:oa,_fnInvalidate:ea,_fnGetRowElements:Ka,_fnCreateTr:Ja,_fnBuildHead:jb,_fnDrawHead:ga,_fnDraw:M,_fnReDraw:R,_fnAddOptionsHtml:mb,_fnDetectHeader:fa,_fnGetUniqueThs:qa,_fnFeatureHtmlFilter:ob,_fnFilterComplete:ha,_fnFilterCustom:xb,_fnFilterColumn:wb,_fnFilter:vb,_fnFilterCreateSearch:Qa,_fnEscapeRegex:va,_fnFilterData:yb,_fnFeatureHtmlInfo:rb,_fnUpdateInfo:Bb,_fnInfoMacros:Cb,_fnInitialise:ia,_fnInitComplete:ta,_fnLengthChange:Ra,
 _fnFeatureHtmlLength:nb,_fnFeatureHtmlPaginate:sb,_fnPageChange:Ta,_fnFeatureHtmlProcessing:pb,_fnProcessingDisplay:C,_fnFeatureHtmlTable:qb,_fnScrollDraw:Z,_fnApplyToChildren:G,_fnCalculateColumnWidths:Ha,_fnThrottle:ua,_fnConvertToWidth:Eb,_fnGetWidestNode:Fb,_fnGetMaxLenString:Gb,_fnStringToCss:t,_fnSortFlatten:V,_fnSort:lb,_fnSortAria:Ib,_fnSortListener:Ua,_fnSortAttachListener:Oa,_fnSortingClasses:xa,_fnSortData:Hb,_fnSaveState:ya,_fnLoadState:Jb,_fnSettingsFromNode:za,_fnLog:I,_fnMap:E,_fnBindAction:Va,
-_fnCallbackReg:z,_fnCallbackFire:w,_fnLengthOverflow:Sa,_fnRenderer:Pa,_fnDataSource:y,_fnRowAttributes:Na,_fnCalculateEnd:function(){}});g.fn.dataTable=k;g.fn.dataTableSettings=k.settings;g.fn.dataTableExt=k.ext;g.fn.DataTable=function(a){return g(this).dataTable(a).api()};g.each(k,function(a,b){g.fn.DataTable[a]=b});return g.fn.dataTable};"function"===typeof define&&define.amd?define(["jquery"],S):"object"===typeof exports?module.exports=function(g){return S(g||require("jquery"))}:jQuery&&!jQuery.fn.dataTable&&
+_fnCallbackReg:z,_fnCallbackFire:w,_fnLengthOverflow:Sa,_fnRenderer:Pa,_fnDataSource:y,_fnRowAttributes:Na,_fnCalculateEnd:function(){}});g.fn.dataTable=k;g.fn.dataTableSettings=k.settings;g.fn.dataTableExt=k.ext;g.fn.DataTable=function(a){return g(this).dataTable(a).api()};g.each(k,function(a,b){g.fn.DataTable[a]=b});return g.fn.dataTable};"function"===typeof define&&define.amd?define(["jquery"],S):"object"===typeof exports?module.exports=function(g){return S(g||require("jquery"))}:S(jQuery)})(window,
-S(jQuery)})(window,document);
+document);