Changeset:
713d5a2fefba
https://sourceforge.net/p/mrbs/hg-code/ci/713d5a2fefbaa5f971006e039ca2bb69c6842393
Author:
Campbell Morrison <[email protected]>
Date:
Thu Feb 11 14:32:06 2016 +0000
Log message:
Converted datatables.js.php
diffstat:
web/js.inc | 9 +-
web/js/datatables.js.inc | 203 ++++++++++++++++++++++++++++++++++++++++++++
web/js/datatables.js.php | 213 -----------------------------------------------
3 files changed, 210 insertions(+), 215 deletions(-)
diffs (truncated from 451 to 300 lines):
diff -r a9b5edacb254 -r 713d5a2fefba web/js.inc
--- a/web/js.inc Thu Feb 11 14:22:05 2016 +0000
+++ b/web/js.inc Thu Feb 11 14:32:06 2016 +0000
@@ -140,6 +140,13 @@
require 'js/functions.js.inc';
require 'js/datepicker.js.inc';
require 'js/general.js.inc';
+
+ // Those pages that use DataTables
+ if (in_array($page, array('admin', 'edit_users', 'pending', 'report',
'search')))
+ {
+ require 'js/datatables.js.inc';
+ }
+
?>
//]]>
</script>
@@ -174,8 +181,6 @@
?>
<script type="text/javascript"
src="jquery/datatables/js/plugins.js"></script>
-
- <script type="text/javascript" src="js/datatables.js.php?<?php echo
$standard_query_string ?>"></script>
<?php
}
diff -r a9b5edacb254 -r 713d5a2fefba web/js/datatables.js.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/js/datatables.js.inc Thu Feb 11 14:32:06 2016 +0000
@@ -0,0 +1,203 @@
+<?php
+
+// $Id$
+
+// Get the types, which are assumed to be in a data-type in a <span> in the
<th>
+// of the table
+?>
+var getTypes = function getTypes(table) {
+ var type,
+ types = {},
+ result = [];
+
+ table.find('thead tr:first th').each(function(i) {
+ var type = $(this).find('span').data('type');
+
+ if (type)
+ {
+ if (types[type] === undefined)
+ {
+ types[type] = [];
+ }
+ types[type].push(i);
+ }
+ });
+
+ for (type in types)
+ {
+ if (types.hasOwnProperty(type))
+ {
+ result.push({type: type,
+ targets: types[type]});
+ }
+ }
+
+ return result;
+ };
+
+
+<?php
+// Turn the table with id 'id' into a DataTable, using specificOptions
+// which are merged with the default options. If the browser is IE6 or less
+// we don't bother making a dataTable: it can be done, but it's not worth it.
+//
+// fixedColumnsOptions is an optional object that gets passed directly to the
+// DataTables FixedColumns constructor
+//
+// If you want to do anything else as part of fnInitComplete then you'll need
+// to define fnInitComplete in specificOptions
+?>
+
+function makeDataTable(id, specificOptions, fixedColumnsOptions)
+{
+ var i,
+ defaultOptions,
+ mergedOptions,
+ colVisIncludeCols,
+ nCols,
+ table,
+ dataTable,
+ fixedColumns;
+
+ if (lteIE6)
+ {
+ $('.js div.datatable_container').css('visibility', 'visible');
+ return false;
+ }
+ else
+ {
+ table = $(id);
+ if (table.length === 0)
+ {
+ return false;
+ }
+ <?php
+ // Remove the <colgroup>. This is only needed to assist in the formatting
+ // of the non-datatable version of the table. When we have a datatable,
+ // the datatable sorts out its own formatting.
+ ?>
+ table.find('colgroup').remove();
+
+ <?php // Set up the default options ?>
+ defaultOptions = {
+ buttons: [{extend: 'colvis',
+ text: '<?php echo escape_js(get_vocab("show_hide_columns"))
?>'}],
+ deferRender: true,
+ paging: true,
+ pageLength: 25,
+ pagingType: 'full_numbers',
+ processing: true,
+ scrollCollapse: true,
+ stateSave: true,
+ dom: 'B<"clear">lfrtip',
+ scrollX: '100%',
+ colReorder: {}
+ };
+
+ <?php
+ // Set the language file to be used
+ if ($lang_file = get_datatable_lang_file('jquery/datatables/language'))
+ {
+ // If using the language.url way of loading a DataTables language file,
+ // then the file must be valid JSON. The .lang files that can be
+ // downloaded from GitHub are not valid JSON as they contain comments.
They
+ // therefore cannot be used with language.url, but instead have to be
+ // included directly. Note that if ever we go back to using the url
+ // method then the '../' would need to be stripped off the pathname, as
in
+ // $lang_file = substr($lang_file, 3); // strip off the '../'
+ ?>
+ defaultOptions.language = <?php include $lang_file ?>;
+ <?php
+ }
+ ?>
+
+
+ <?php
+ // Construct the set of columns to be included in the column visibility
+ // button. If specificOptions is set then use that. Otherwise include
+ // all columns except any fixed columns.
+ ?>
+ if (specificOptions &&
+ specificOptions.buttons &&
+ specificOptions.buttons[0] &&
+ specificOptions.buttons[0].columns)
+ {
+ defaultOptions.buttons[0].columns = specificOptions.buttons;
+ }
+ else
+ {
+ colVisIncludeCols = [];
+ nCols = table.find('tr:first-child th').length;
+ for (i=0; i<nCols; i++)
+ {
+ if (fixedColumnsOptions)
+ {
+ if (fixedColumnsOptions.leftColumns && (i <
fixedColumnsOptions.leftColumns))
+ {
+ continue;
+ }
+ if (fixedColumnsOptions.rightColumns && (i >=
nCols-fixedColumnsOptions.rightColumns))
+ {
+ continue;
+ }
+ }
+ colVisIncludeCols.push(i);
+ }
+ defaultOptions.buttons[0].columns = colVisIncludeCols;
+ }
+ <?php
+ // Merge the specific options with the default options. We do a deep
+ // merge.
+ ?>
+ mergedOptions = $.extend(true, {}, defaultOptions, specificOptions);
+ dataTable = table.DataTable(mergedOptions);
+
+ if (fixedColumnsOptions)
+ {
+ fixedColumns = new $.fn.dataTable.FixedColumns(dataTable,
fixedColumnsOptions);
+ }
+
+ <?php
+ // If we're using an Ajax data source then don't offer column reordering.
+ // This is a problem at the moment in DataTables because if you reorder a
column
+ // DataTables doesn't know that the Ajax data is still in the original
order.
+ // May be fixed in a future release of DataTables
+ ?>
+ if (!specificOptions.ajax)
+ {
+ <?php
+ /*
+ // In fact we don't use column reordering at all, because (a) it doesn't
+ // work with an Ajax source (b) there's no way of fixing the right hand
column
+ // (c) iFixedColumns doesn't seem to work properly and (d) it's confusing
+ // for the user having reordering enabled sometimes and sometimes not.
Better
+ // to wait for a future release of DataTables when these issues have been
+ // fixed. In the meantime the line of code we need is there below so we
can see
+ // how it is done, but commented out.
+
+ var oCR = new ColReorder(oTable, mergedOptions);
+
+ */
+ ?>
+ }
+
+ $('.js div.datatable_container').css('visibility', 'visible');
+ <?php // Need to adjust column sizing after the table is made visible ?>
+ dataTable.columns.adjust();
+
+ <?php
+ // Adjust the column sizing on a window resize. We shouldn't have to do
this because
+ // columns.adjust() is called automatically by DataTables on a window
resize, but if we
+ // don't then a right hand fixed column appears twice when a window's
width is increased.
+ // I have tried to create a simple test case, but everything works OK in
the test case, so
+ // it's something to do with the way MRBS uses DataTables - maybe the CSS,
or maybe the
+ // JavaScript.
+ ?>
+ $(window).resize(function () {
+ dataTable.columns.adjust();
+ });
+
+ return dataTable;
+ }
+}
+
diff -r a9b5edacb254 -r 713d5a2fefba web/js/datatables.js.php
--- a/web/js/datatables.js.php Thu Feb 11 14:22:05 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-<?php
-
-// $Id$
-
-require "../defaultincludes.inc";
-
-header("Content-type: application/x-javascript");
-expires_header(60*30); // 30 minute expiry
-
-if ($use_strict)
-{
- echo "'use strict';\n";
-}
-
-
-// Get the types, which are assumed to be in a data-type in a <span> in the
<th>
-// of the table
-?>
-var getTypes = function getTypes(table) {
- var type,
- types = {},
- result = [];
-
- table.find('thead tr:first th').each(function(i) {
- var type = $(this).find('span').data('type');
-
- if (type)
- {
- if (types[type] === undefined)
- {
- types[type] = [];
- }
- types[type].push(i);
- }
- });
-
- for (type in types)
- {
- if (types.hasOwnProperty(type))
- {
- result.push({type: type,
- targets: types[type]});
- }
- }
-
- return result;
- };
-
-
-<?php
-// Turn the table with id 'id' into a DataTable, using specificOptions
-// which are merged with the default options. If the browser is IE6 or less
-// we don't bother making a dataTable: it can be done, but it's not worth it.
-//
-// fixedColumnsOptions is an optional object that gets passed directly to the
-// DataTables FixedColumns constructor
-//
-// If you want to do anything else as part of fnInitComplete then you'll need
-// to define fnInitComplete in specificOptions
-?>
-
-function makeDataTable(id, specificOptions, fixedColumnsOptions)
-{
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
