thameera
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1240 from rasika/master

Browse Source 
Fix advanced operationsbar overlapping when multiple tables exists.
revert-70aa11f8
Rasika Perera 7 years ago committed by GitHub
parent 3201dfcfa9 5f37af8fd1
commit 49584eb8f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
Unescape View File

@ -232,14 +232,14 @@ $.fn.datatables_extended = function (settings) {
/** /**
* append advance operations to list table toolbar * append advance operations to list table toolbar
*/ */
$('.dataTable.list-table').closest('.dataTables_wrapper').find('.dataTablesTop .dataTables_toolbar').html( table.closest('.dataTables_wrapper').find('.dataTable.list-table').closest('.dataTables_wrapper').find('.dataTablesTop .dataTables_toolbar').html(
getAdvanceToolBar() getAdvanceToolBar()
); );
/** /**
* sorting dropdown menu select function * sorting dropdown menu select function
*/ */
$('.dataTables_wrapper .sort-list li a').click(function () { table.closest('.dataTables_wrapper').find('.sort-list li a').click(function () {
$(this).closest('li').siblings('li').find('a').removeClass('sorting_asc').removeClass('sorting_desc'); $(this).closest('li').siblings('li').find('a').removeClass('sorting_asc').removeClass('sorting_desc');
var thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable(); var thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
@ -263,7 +263,7 @@ $.fn.datatables_extended = function (settings) {
/** /**
* Enable/Disable selection on rows * Enable/Disable selection on rows
*/ */
$('.dataTables_wrapper [data-click-event=toggle-selectable]').click(function () { table.closest('.dataTables_wrapper').find('[data-click-event=toggle-selectable]').click(function () {
var button = this, var button = this,
thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable(); thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
if ($(button).html() == 'Select') { if ($(button).html() == 'Select') {
@ -286,7 +286,7 @@ $.fn.datatables_extended = function (settings) {
/** /**
* select/deselect all rows function * select/deselect all rows function
*/ */
$('.dataTables_wrapper [data-click-event=toggle-selected]').click(function () { table.closest('.dataTables_wrapper').find('[data-click-event=toggle-selected]').click(function () {
var button = this, var button = this,
thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable(); thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
if ($(button).html() == 'Select All') { if ($(button).html() == 'Select All') {

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
Unescape View File

@ -290,14 +290,14 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
/** /**
* append advance operations to list table toolbar * append advance operations to list table toolbar
*/ */
$('.dataTable.list-table').closest('.dataTables_wrapper').find('.dataTablesTop .dataTables_toolbar').html( table.closest('.dataTables_wrapper').find('.dataTablesTop .dataTables_toolbar').html(
getAdvanceToolBar() getAdvanceToolBar()
); );
/** /**
* sorting dropdown menu select function * sorting dropdown menu select function
*/ */
$('.dataTables_wrapper .sort-list li a').click(function () { table.closest('.dataTables_wrapper').find('.sort-list li a').click(function () {
$(this).closest('li').siblings('li').find('a').removeClass('sorting_asc').removeClass('sorting_desc'); $(this).closest('li').siblings('li').find('a').removeClass('sorting_asc').removeClass('sorting_desc');
var thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable(); var thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
@ -321,7 +321,7 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
/** /**
* Enable/Disable selection on rows * Enable/Disable selection on rows
*/ */
$('.dataTables_wrapper [data-click-event=toggle-selectable]').click(function () { table.closest('.dataTables_wrapper').find('[data-click-event=toggle-selectable]').click(function () {
var button = this, var button = this,
thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable(); thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
if ($(button).html() == 'Select') { if ($(button).html() == 'Select') {
@ -345,7 +345,7 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
/** /**
* select/deselect all rows function * select/deselect all rows function
*/ */
$('.dataTables_wrapper [data-click-event=toggle-selected]').click(function () { table.closest('.dataTables_wrapper').find('[data-click-event=toggle-selected]').click(function () {
var button = this, var button = this,
thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable(); thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
if (!$(button).hasClass('disabled')) { if (!$(button).hasClass('disabled')) {

Write Preview
Loading…
Cancel
Save