composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 16:48:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

PHPDoc

Browse Source
This commit is contained in:
Molkobain
2019-11-20 15:34:06 +01:00
parent 83fc069bf4
commit 41d5ae704a
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-portal-base/portal/public/js/bootstrap-patches.js vendored
View File

@@ -14,8 +14,6 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*
*
*/
/*
@@ -25,7 +23,7 @@
* @since 2.6.2
*/
//N°2166: Fix a bootstrap/CKeditor incompatibility with their respective modals (source: https://stackoverflow.com/a/31679096)
// N°2166: Fix a bootstrap/CKeditor incompatibility with their respective modals (source: https://stackoverflow.com/a/31679096)
$.fn.modal.Constructor.prototype.enforceFocus = function() {
$( document )
.off( 'focusin.bs.modal' ) // guard against infinite focus loop

19
datamodels/2.x/itop-portal-base/portal/public/js/bootstrap-portal-modal.js vendored
View File

@@ -16,11 +16,21 @@
* You should have received a copy of the GNU Affero General Public License
*/
/**
* General events manager for BS modals
* This file has a DIFFERENT purpose than the "bootstrap-patches.js"
*
* @since 2.7.0
*/
$(document).ready(function()
{
var oBodyElem = $('body');
// Hack to enable a same modal to load content from different urls
/*
* Hack to enable a same modal to load content from different urls
*
* Without it, content from the previous modal is visible while new content is being fetched from the server
*/
oBodyElem.on('hidden.bs.modal', '.modal#modal-for-all', function ()
{
$(this).removeData('bs.modal');
@@ -33,8 +43,11 @@ $(document).ready(function()
$(this).find('.tooltip.in').tooltip('hide');
});
// Display a error message on modal if the content could not be loaded.
// Note : As of now, we can't display a more detailled message based on the response because Bootstrap doesn't pass response data with the loaded event.
/*
* Display a error message on modal if the content could not be loaded.
*
* Note : As of now, we can't display a more detailed message based on the response because Bootstrap doesn't pass response data with the loaded event.
*/
oBodyElem.on('loaded.bs.modal', function (oEvent)
{
var sModalContent = $(oEvent.target).find('.modal-content').html();