From 6162cb148f9ab2fe82c067f4c04340492b600a7a Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 6 Apr 2016 17:43:05 +0200 Subject: [PATCH] [New] Defer initial loading of data tables --- .../src/main/webapp/js/functions.js | 1 + .../src/main/webapp/js/parts/model.js | 7 +++++-- .../src/main/webapp/parts/model.html | 12 +++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/li.strolch.planningwebapp/src/main/webapp/js/functions.js b/li.strolch.planningwebapp/src/main/webapp/js/functions.js index 566ebb54b..f70ac757f 100644 --- a/li.strolch.planningwebapp/src/main/webapp/js/functions.js +++ b/li.strolch.planningwebapp/src/main/webapp/js/functions.js @@ -298,6 +298,7 @@ strolch.fn.initDataTable = function (queryData, columns) { lengthMenu: [[5, 10, 20, -1], [5, 10, 20, 'All']], processing: true, searching: false, + deferLoading: 0, serverSide: true, ajax: function (data, callback, settings) { diff --git a/li.strolch.planningwebapp/src/main/webapp/js/parts/model.js b/li.strolch.planningwebapp/src/main/webapp/js/parts/model.js index e5686c920..786b78d0a 100644 --- a/li.strolch.planningwebapp/src/main/webapp/js/parts/model.js +++ b/li.strolch.planningwebapp/src/main/webapp/js/parts/model.js @@ -22,12 +22,15 @@ strolch.parts.model.init = function (domParent) { strolch.parts.model.registerHandlers = function () { + $('#part-model').find('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + var tableSel = $(e.target).attr('href'); + $(tableSel).find('table').DataTable().draw(); + }); + console.log('Registered handlers'); }; strolch.parts.model.show = function () { - - $('#part-model').show(); }; diff --git a/li.strolch.planningwebapp/src/main/webapp/parts/model.html b/li.strolch.planningwebapp/src/main/webapp/parts/model.html index c5e28d25d..e248869b7 100644 --- a/li.strolch.planningwebapp/src/main/webapp/parts/model.html +++ b/li.strolch.planningwebapp/src/main/webapp/parts/model.html @@ -4,14 +4,15 @@
-
+
@@ -26,7 +27,8 @@
- @@ -35,7 +37,7 @@ -
+
The resources for the current user's realm