svn commit: r1613098 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js

[de...@apache.org]

Author: degenaro
Date: Thu Jul 24 12:53:45 2014
New Revision: 1613098

URL: http://svn.apache.org/r1613098
Log:
UIMA-3957 DUCC Web Server (WS) upgrade to newer versions of open source code

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js?rev=1613098&r1=1613097&r2=1613098&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js Thu Jul 24 12:53:45 2014
@@ -1,46 +1,67 @@
-
-$.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallback, bStandingRedraw )
+jQuery.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallback, bStandingRedraw )
 {
-    if ( typeof sNewSource != 'undefined' && sNewSource != null )
-    {
+    // DataTables 1.10 compatibility - if 1.10 then `versionCheck` exists.
+    // 1.10's API has ajax reloading built in, so we use those abilities
+    // directly.
+    if ( jQuery.fn.dataTable.versionCheck ) {
+        var api = new jQuery.fn.dataTable.Api( oSettings );
+ 
+        if ( sNewSource ) {
+            api.ajax.url( sNewSource ).load( fnCallback, !bStandingRedraw );
+        }
+        else {
+            api.ajax.reload( fnCallback, !bStandingRedraw );
+        }
+        return;
+    }
+ 
+    if ( sNewSource !== undefined && sNewSource !== null ) {
         oSettings.sAjaxSource = sNewSource;
     }
+ 
+    // Server-side processing should just call fnDraw
+    if ( oSettings.oFeatures.bServerSide ) {
+        this.fnDraw();
+        return;
+    }
+ 
     this.oApi._fnProcessingDisplay( oSettings, true );
     var that = this;
     var iStart = oSettings._iDisplayStart;
     var aData = [];
-
+ 
     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 );
-
+ 
         /* Got the data - add it to the table */
         var aData =  (oSettings.sAjaxDataProp !== "") ?
             that.oApi._fnGetObjectDataFn( oSettings.sAjaxDataProp )( json ) : json;
-
+ 
         for ( var i=0 ; i<aData.length ; i++ )
         {
             that.oApi._fnAddData( oSettings, aData[i] );
         }
-
+ 
         oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+ 
         that.fnDraw();
-
-        if ( typeof bStandingRedraw != 'undefined' && bStandingRedraw === true )
+ 
+        if ( bStandingRedraw === true )
         {
             oSettings._iDisplayStart = iStart;
+            that.oApi._fnCalculateEnd( oSettings );
             that.fnDraw( false );
         }
-
+ 
         that.oApi._fnProcessingDisplay( oSettings, false );
-
+ 
         /* Callback user function - for event handlers etc */
-        if ( typeof fnCallback == 'function' && fnCallback != null )
+        if ( typeof fnCallback == 'function' && fnCallback !== null )
         {
             fnCallback( oSettings );
         }
     }, oSettings );
-}
-
+};
\ No newline at end of file