From 4b378ff78738fc8dd31ac5d9ab9ade37a15f834b Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Wed, 15 Jul 2015 17:10:24 +0100 Subject: [PATCH] Dev: Updating the XML for the external styling examples to use the new example build framework --- .datatables-commit-sync | 2 +- examples/styling/foundation.html | 12 +++++------- examples/styling/jqueryUI.html | 12 +++++------- media/js/jquery.dataTables.js | 2 +- media/js/jquery.dataTables.min.js | 2 +- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index f26fe33c..0a2ac22c 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -c856d0eb232ce41c76d0c30739d33e47cc7288f4 +e8b33dbd26132c20a8277b597d9aee75c4377b5b diff --git a/examples/styling/foundation.html b/examples/styling/foundation.html index 949e4bc8..300e6497 100644 --- a/examples/styling/foundation.html +++ b/examples/styling/foundation.html @@ -7,7 +7,7 @@ DataTables example - Foundation - + - + - +

DataTables example Foundation

@@ -545,8 +545,7 @@ $(document).ready(function() {
@@ -564,8 +563,7 @@ $(document).ready(function() { diff --git a/examples/styling/jqueryUI.html b/examples/styling/jqueryUI.html index fc726029..e9e3788d 100644 --- a/examples/styling/jqueryUI.html +++ b/examples/styling/jqueryUI.html @@ -7,7 +7,7 @@ DataTables example - jQuery UI ThemeRoller - + - + - +

DataTables example jQuery UI ThemeRoller

@@ -548,8 +548,7 @@ $(document).ready(function() {
@@ -567,8 +566,7 @@ $(document).ready(function() { diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 6dc325e0..d20a470a 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -519,7 +519,7 @@ // Scrolling feature / quirks detection var n = $('
') .css( { - position: 'fixed', + position: 'absolute', top: 0, left: 0, height: 1, diff --git a/media/js/jquery.dataTables.min.js b/media/js/jquery.dataTables.min.js index c7a5bfd6..aed6e562 100644 --- a/media/js/jquery.dataTables.min.js +++ b/media/js/jquery.dataTables.min.js @@ -4,7 +4,7 @@ */ (function(Ga,T,k){var S=function(h){function Y(a){var b,c,e={};h.each(a,function(d){if((b=d.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=d.replace(b[0],b[2].toLowerCase()),e[c]=d,"o"===b[1]&&Y(a[d])});a._hungarianMap=e}function H(a,b,c){a._hungarianMap||Y(a);var e;h.each(b,function(d){e=a._hungarianMap[d];if(e!==k&&(c||b[e]===k))"o"===e.charAt(0)?(b[e]||(b[e]={}),h.extend(!0,b[e],b[d]),H(a[e],b[e],c)):b[e]=b[d]})}function S(a){var b=m.defaults.oLanguage,c=a.sZeroRecords; !a.sEmptyTable&&(c&&"No data available in table"===b.sEmptyTable)&&E(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&(c&&"Loading..."===b.sLoadingRecords)&&E(a,a,"sZeroRecords","sLoadingRecords");a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&eb(a)}function fb(a){B(a,"ordering","bSort");B(a,"orderMulti","bSortMulti");B(a,"orderClasses","bSortClasses");B(a,"orderCellsTop","bSortCellsTop");B(a,"order","aaSorting");B(a,"orderFixed","aaSortingFixed");B(a,"paging","bPaginate"); -B(a,"pagingType","sPaginationType");B(a,"pageLength","iDisplayLength");B(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b").css({position:"fixed", +B(a,"pagingType","sPaginationType");B(a,"pageLength","iDisplayLength");B(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b").css({position:"absolute", top:0,left:0,height:1,width:1,overflow:"hidden"}).append(h("
").css({position:"absolute",top:1,left:1,width:100,overflow:"scroll"}).append(h('
').css({width:"100%",height:10}))).appendTo("body"),c=b.find(".test");a.bScrollOversize=100===c[0].offsetWidth;a.bScrollbarLeft=1!==Math.round(c.offset().left);b.remove()}function ib(a,b,c,e,d,f){var g,j=!1;c!==k&&(g=c,j=!0);for(;e!==d;)a.hasOwnProperty(e)&&(g=j?b(g,a[e],e,a):a[e],j=!0,e+=f);return g}function Ha(a,b){var c=m.defaults.column, e=a.aoColumns.length,c=h.extend({},m.models.oColumn,c,{nTh:b?b:T.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[e],mData:c.mData?c.mData:e,idx:e});a.aoColumns.push(c);c=a.aoPreSearchCols;c[e]=h.extend({},m.models.oSearch,c[e]);la(a,e,h(b).data())}function la(a,b,c){var b=a.aoColumns[b],e=a.oClasses,d=h(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=d.attr("width")||null;var f=(d.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);f&&(b.sWidthOrig=f[1])}c!== k&&null!==c&&(gb(c),H(m.defaults.column,c),c.mDataProp!==k&&!c.mData&&(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),h.extend(b,c),E(b,c,"sWidth","sWidthOrig"),c.iDataSort!==k&&(b.aDataSort=[c.iDataSort]),E(b,c,"aDataSort"));var g=b.mData,j=O(g),i=b.mRender?O(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=h.isPlainObject(g)&&(c(g.sort)||c(g.type)||c(g.filter));b.fnGetData=function(a,b,c){var e=j(a,b,