Merge branch 'master' of github.com:DataTables/Plugins

api/fnReloadAjax.js

@@ -30,7 +30,7 @@ $.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallba
  
 	this.oApi._fnServerParams( oSettings, aData );
 	 
-	oSettings.fnServerData( oSettings.sAjaxSource, aData, function(json) {
+	oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aData, function(json) {
 		/* Clear the old information from the table */
 		that.oApi._fnClearTable( oSettings );
 		 
@@ -44,13 +44,16 @@ $.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallba
 		}
 		 
 		oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-		that.fnDraw();
 		 
 		if ( typeof bStandingRedraw != 'undefined' && bStandingRedraw === true )
 		{
 			oSettings._iDisplayStart = iStart;
 			that.fnDraw( false );
 		}
+		else
+		{
+			that.fnDraw();
+		}
 		 
 		that.oApi._fnProcessingDisplay( oSettings, false );
 		 

integration/bootstrap/dataTables.bootstrap.css

@@ -24,6 +24,7 @@ div.dataTables_paginate {
 table.table {
 	clear: both;
 	margin-bottom: 6px !important;
+	max-width: none !important;
 }
 
 table.table thead .sorting,

sorting/chinese-string.js

@@ -0,0 +1,18 @@
+/**
+ * Sorting in Javascript for Chinese Character. The Chinese Characters are sorted on the radical and number of 
+ * strokes. This plug-in  performs  sorting for Chinese characters.
+ * <a href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/localeCompare">localeCompare MDC documentation</a>. 
+ * Please also see <a href="http://www.datatables.net/forums/discussion/9700/sorting-non-ascii-characters-and-data-content-html-tag-sorting/p1">note about localeCompare and IE9</a>.
+ *  @name Chinese (string)
+ *  @anchor chinese-string
+ *  @author <a href="http://www.lcube.se/sorting-chinese-characters-in-javascript/">Patrik Lindstr<EFBFBD>m</a>
+ */
+ 
+ jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+	"chinese-string-asc" : function (s1, s2) {
+		return s1.localeCompare(s2);
+	},
+	"chinese-string-desc" : function (s1, s2) {
+		return s2.localeCompare(s1);
+	}
+} );