X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2Fcommon%2Fjsortable.tpl;h=58139f21ed15e359b7543ce3eebbc71ea50cff1f;hb=07218de046ef00cb6f5be43179f5db18afa0352d;hp=1491a16b6a53a0cbe6bb4418e58c205e4bed8b69;hpb=f2a84e5c7c916f6c0d4c7fce69b844b019c17dd1;p=civicrm-core.git

diff --git a/templates/CRM/common/jsortable.tpl b/templates/CRM/common/jsortable.tpl
index 1491a16b6a..58139f21ed 100644
--- a/templates/CRM/common/jsortable.tpl
+++ b/templates/CRM/common/jsortable.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -25,183 +25,161 @@
 *}
 {literal}
 <script type="text/javascript">
-CRM.$(function($) {
-// for date sorting see http://wiki.civicrm.org/confluence/display/CRMDOC/Sorting+Date+Fields+in+dataTables+Widget
-var useAjax = {/literal}{if $useAjax}1{else}0{/if}{literal};
-var sortEnabled = true;
-var sourceUrl = '';
-var useClass  = 'display';
+  CRM.$(function($) {
 
-var tcount =1;
-if ( useAjax ) {
- {/literal}{if isset($sourceUrl)}sourceUrl = "{$sourceUrl}";{/if}{literal}
- useClass = 'pagerDisplay';
- tcount =5;
-}
+    function getElementClass(element) {
+      return $(element).attr('class') || '';
+    }
+
+    // fetch the occurrence of element
+    function getRowId(row, str) {
+      var optionId;
+      $.each(row, function(i, n) {
+        if (str === $(n).attr('class')) {
+          optionId = i;
+        }
+      });
+      return optionId;
+    }
+
+    // for date sorting see http://wiki.civicrm.org/confluence/display/CRMDOC/Sorting+Date+Fields+in+dataTables+Widget
+    var useAjax = {/literal}{if $useAjax}1{else}0{/if}{literal},
+      sourceUrl = '',
+      useClass  = 'display',
+      tcount = 1,
+      tableId = [];
 
-var tableId = '';
-var count   = 1;
+    if ( useAjax ) {
+      {/literal}{if isset($sourceUrl)}sourceUrl = "{$sourceUrl}";{/if}{literal}
+      useClass = 'pagerDisplay';
+      tcount = 5;
+    }
 
-//rename id of table with sequence
-//and create the object for navigation
-cj('table.' + useClass).each(function(){
-    cj(this).attr('id','option' + tcount + count);
-    tableId += count + ',';
-    count++;
-});
+    CRM.dataTableCount = CRM.dataTableCount || 1;
 
-//remove last comma
-tableId = tableId.substring(0, tableId.length - 1 );
-eval('tableId =[' + tableId + ']');
+    // FIXME: Rewriting DOM ids is probably a bad idea, and could be avoided
+    $('table.' + useClass).not('.dataTable').each(function() {
+      $(this).attr('id','option' + tcount + CRM.dataTableCount);
+      tableId.push(CRM.dataTableCount);
+      CRM.dataTableCount++;
+    });
 
-  cj.each(tableId, function(i,n){
-    tabId = '#option' + tcount + n;
-    //get the object of first tr data row.
-    tdObject = cj(tabId + ' tr:nth(1) td');
-    var id = -1; var count = 0; var columns=''; var sortColumn = '';
-    //build columns array for sorting or not sorting
-    cj(tabId + ' th').each( function( ) {
-        var option = cj(this).prop('id').split("_");
+    $.each(tableId, function(i,n){
+      var tabId = '#option' + tcount + n;
+      //get the object of first tr data row.
+      var tdObject = $(tabId + ' tr:nth(1) td');
+      var id = -1; var count = 0; var columns=''; var sortColumn = '';
+      //build columns array for sorting or not sorting
+      $(tabId + ' th').each( function( ) {
+        var option = $(this).prop('id').split("_");
         option  = ( option.length > 1 ) ? option[1] : option[0];
-        stype   = 'numeric';
+        var stype   = 'numeric';
         switch( option ) {
-            case 'sortable':
-                sortColumn += '[' + count + ', "asc" ],';
-                columns += '{"sClass": "'+ getElementClass( this ) +'"},';
+          case 'sortable':
+            sortColumn += '[' + count + ', "asc" ],';
+            columns += '{"sClass": "'+ getElementClass( this ) +'"},';
             break;
-            case 'date':
-                stype = 'date';
-            case 'order':
-                if ( cj(this).attr('class') == 'sortable' ){
-                    sortColumn += '[' + count + ', "asc" ],';
-                }
-                sortId   = getRowId(tdObject, cj(this).attr('id') +' hiddenElement' );
-                sortEnabled = true;
-                columns += '{ "render": function ( data, type, row ) { return "<div style=\'display:none\'>"+ data +"</div>" + row[sortId] ; }, "targets": sortColumn,"bUseRendered": false},';
+          case 'date':
+            stype = 'date';
+          case 'order':
+            if ( $(this).attr('class') == 'sortable' ){
+              sortColumn += '[' + count + ', "asc" ],';
+            }
+            var sortId   = getRowId(tdObject, $(this).attr('id') +' hiddenElement' );
+            columns += '{ "render": function ( data, type, row ) { return "<div style=\'display:none\'>"+ data +"</div>" + row[sortId] ; }, "targets": sortColumn,"bUseRendered": false},';
             break;
-            case 'nosort':
-                columns += '{ "bSortable": false, "sClass": "'+ getElementClass( this ) +'"},';
+          case 'nosort':
+            columns += '{ "bSortable": false, "sClass": "'+ getElementClass( this ) +'"},';
             break;
-            case 'currency':
-                columns += '{ "sType": "currency" },';
+          case 'currency':
+            columns += '{ "sType": "currency" },';
             break;
-            case 'link':
-                columns += '{"sType": "html"},';
+          case 'link':
+            columns += '{"sType": "html"},';
             break;
-            default:
-                if ( cj(this).text() ) {
-                    columns += '{"sClass": "'+ getElementClass( this ) +'"},';
-                } else {
-                    columns += '{ "bSortable": false },';
-                }
+          default:
+            if ( $(this).text() ) {
+              columns += '{"sClass": "'+ getElementClass( this ) +'"},';
+            } else {
+              columns += '{ "bSortable": false },';
+            }
             break;
         }
         count++;
-  });
-  columns    = columns.substring(0, columns.length - 1 );
-  sortColumn = sortColumn.substring(0, sortColumn.length - 1 );
-  eval('sortColumn =[' + sortColumn + ']');
-  eval('columns =[' + columns + ']');
-
-        var currTable = cj(tabId);
-        if (currTable) {
-            // contains the dataTables master records
-            var s = cj(document).dataTableSettings;
-            if (s != 'undefined') {
-                var len = s.length;
-                for (var i=0; i < len; i++) {
-                    // if already exists, remove from the array
-                    if (s[i].sInstance = tabId) {
-                        s.splice(i,1);
-              }
-              }
-        }
-  }
-
-    var noRecordFoundMsg  = {/literal}'{ts escape="js"}There are no records.{/ts}'{literal};
-
-    oTable = null;
-    if ( useAjax ) {
-      oTable = cj(tabId).dataTable({
-              "bFilter"    : false,
-              "bAutoWidth" : false,
-              "aaSorting"  : sortColumn,
-              "aoColumns"  : columns,
-              "bProcessing": true,
-              "bJQueryUI"  : true,
-              "asStripClasses" : [ "odd-row", "even-row" ],
-              "sPaginationType": "full_numbers",
-              "sDom"       : '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
-              "bServerSide": true,
-              "sAjaxSource": sourceUrl,
-              "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
-              "sZeroRecords" : noRecordFoundMsg },
-
-              {/literal}{if !empty($callBack)}{literal}
-              "fnDrawCallback": function() { checkSelected(); },
-              {/literal}{/if}{literal}
+      });
+      // Fixme: this could be done without eval
+      columns    = columns.substring(0, columns.length - 1 );
+      sortColumn = sortColumn.substring(0, sortColumn.length - 1 );
+      eval('sortColumn =[' + sortColumn + ']');
+      eval('columns =[' + columns + ']');
 
-              "fnServerData": function ( sSource, aoData, fnCallback ) {
-                cj.ajax( {
-                  "dataType": 'json',
-                  "type": "POST",
-                  "url": sSource,
-                  "data": aoData,
-                  "success": fnCallback
-                });
-              }
-         });
-    } else {
-      oTable = cj(tabId).dataTable({
-                "aaSorting"    : sortColumn,
-                "bPaginate"    : false,
-                "bLengthChange": true,
-                "bFilter"      : false,
-                "bInfo"        : false,
-                "asStripClasses" : [ "odd-row", "even-row" ],
-                "bAutoWidth"   : false,
-                "aoColumns"   : columns,
-                "bSort" : sortEnabled,
-            "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
-                         "sZeroRecords" : noRecordFoundMsg }
-              });
-    }
-    var object;
+      var noRecordFoundMsg  = {/literal}'{ts escape="js"}None found.{/ts}'{literal};
 
+      var oTable;
+      if ( useAjax ) {
+        oTable = $(tabId).dataTable({
+          "bFilter": false,
+          "bAutoWidth": false,
+          "aaSorting": sortColumn,
+          "aoColumns": columns,
+          "bProcessing": true,
+          "bJQueryUI": true,
+          "asStripClasses": [ "odd-row", "even-row" ],
+          "sPaginationType": "full_numbers",
+          "sDom": '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
+          "bServerSide": true,
+          "sAjaxSource": sourceUrl,
+          "oLanguage":{
+            "sEmptyTable": noRecordFoundMsg,
+            "sZeroRecords": noRecordFoundMsg
+          },
+          "fnServerData": function ( sSource, aoData, fnCallback ) {
+            $.ajax( {
+              "dataType": 'json',
+              "type": "POST",
+              "url": sSource,
+              "data": aoData,
+              "success": fnCallback
+            });
+          }
+        });
+      } else {
+        oTable = $(tabId).dataTable({
+          "aaSorting": sortColumn,
+          "bPaginate": false,
+          "bLengthChange": true,
+          "bFilter": false,
+          "bInfo": false,
+          "asStripClasses": [ "odd-row", "even-row" ],
+          "bAutoWidth": false,
+          "aoColumns": columns,
+          "bSort": true,
+          "oLanguage":{
+            "sEmptyTable": noRecordFoundMsg,
+            "sZeroRecords": noRecordFoundMsg
+          }
+        });
+      }
     });
-});
-
-function getElementClass( element ) {
-if( cj(element).attr('class') )   return cj(element).attr('class');
-return '';
-}
-
-//function to fetch the occurence of element
-function getRowId(row,str){
- cj.each( row, function(i, n) {
-    if( str === cj(n).attr('class') ) {
-        optionId = i;
-    }
- });
-return optionId;
-}
+  });
 
-//plugin to sort on currency
-var symbol = "{/literal}{$config->defaultCurrencySymbol($config->defaultSymbol)}{literal}";
-cj.fn.dataTableExt.oSort['currency-asc']  = function(a,b) {
-  var x = (a == "-") ? 0 : a.replace( symbol, "" );
-  var y = (b == "-") ? 0 : b.replace( symbol, "" );
-  x = parseFloat( x );
-  y = parseFloat( y );
-  return ((x < y) ? -1 : ((x > y) ?  1 : 0));
-};
+  //plugin to sort on currency
+  cj.fn.dataTableExt.oSort['currency-asc']  = function(a,b) {
+    var symbol = "{/literal}{$config->defaultCurrencySymbol($config->defaultSymbol)}{literal}";
+    var x = (a == "-") ? 0 : a.replace( symbol, "" );
+    var y = (b == "-") ? 0 : b.replace( symbol, "" );
+    x = parseFloat( x );
+    y = parseFloat( y );
+    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+  };
 
-cj.fn.dataTableExt.oSort['currency-desc'] = function(a,b) {
-  var x = (a == "-") ? 0 : a.replace( symbol, "" );
-  var y = (b == "-") ? 0 : b.replace( symbol, "" );
-  x = parseFloat( x );
-  y = parseFloat( y );
-  return ((x < y) ?  1 : ((x > y) ? -1 : 0));
-};
+  cj.fn.dataTableExt.oSort['currency-desc'] = function(a,b) {
+    var symbol = "{/literal}{$config->defaultCurrencySymbol($config->defaultSymbol)}{literal}";
+    var x = (a == "-") ? 0 : a.replace( symbol, "" );
+    var y = (b == "-") ? 0 : b.replace( symbol, "" );
+    x = parseFloat( x );
+    y = parseFloat( y );
+    return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+  };
 </script>
 {/literal}