diff --git a/system/assets/js/admin/presidecore/preside.iframe.modal.js b/system/assets/js/admin/presidecore/preside.iframe.modal.js index 8b46549fa..727989daf 100644 --- a/system/assets/js/admin/presidecore/preside.iframe.modal.js +++ b/system/assets/js/admin/presidecore/preside.iframe.modal.js @@ -103,12 +103,20 @@ } ); } - if ( typeof callbacks.onShow === "function" ) { - modal.on( "shown.bs.modal", function(){ - modal.off( "shown.bs.modal" ); - callbacks.onShow( modal, getIframe() ); - } ); - } + modal.on( "shown.bs.modal", function(){ + modal.off( "shown.bs.modal" ); + var iframeWin = getIframe(); + + if ( iframeWin && iframeWin.presideJQuery ) { + iframeWin.presideJQuery( "table.object-listing-table" ).each( function(){ + try { iframeWin.presideJQuery( this ).dataTable().fnDraw(); } catch(e) {} + } ); + } + + if ( typeof callbacks.onShow === "function" ) { + callbacks.onShow( modal, iframeWin ); + } + } ); modal.modal( "show" ); };