composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Benjamin Dalsass
2024-07-15 10:59:01 +02:00
parent 40551b36e5 f0c37bd69e
commit f65cadd24c
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,19 +24,16 @@
*/ */
// 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() { // N°7552 Update the ugly hacky hack to make it work with CKEditor 5. Only trigger the focus when the parent is not a CKEditor input (source: https://stackoverflow.com/questions/53556541/ckeditor-5-popup-controls-not-working-in-bootstrap-3-2018)
$( document ) $.fn.modal.Constructor.prototype.enforceFocus = function () {
.off( 'focusin.bs.modal' ) // guard against infinite focus loop var $modalElement = this.$element;
.on( 'focusin.bs.modal', $.proxy( function( e ) { $(document).on('focusin.modal', function (e) {
if ( var $parent = $(e.target.parentNode);
this.$element[ 0 ] !== e.target && !this.$element.has( e.target ).length if ($modalElement[0] !== e.target && !$modalElement.has(e.target).length &&
// CKEditor compatibility fix start. !$parent.hasClass('ck-input')) {
&& !$( e.target ).closest( '.cke_dialog, .cke' ).length e.target.focus()
// CKEditor compatibility fix end. }
) { })
this.$element.trigger( 'focus' );
}
}, this ) );
}; };
// Hack to enable multiple modals by making sure the .modal-open class is set to the <body> when there is at least one modal open left // Hack to enable multiple modals by making sure the .modal-open class is set to the <body> when there is at least one modal open left

2
js/extkeywidget.js
View File

@@ -169,7 +169,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
copyClassesToDropdown: false, copyClassesToDropdown: false,
inputClass: 'ibo-input ibo-input-select ibo-input-selectize', inputClass: 'ibo-input ibo-input-select ibo-input-selectize',
// To avoid dropdown to be cut by the container's overflow hidden rule // To avoid dropdown to be cut by the container's overflow hidden rule
dropdownParent: 'body', // dropdownParent: 'body', QUICKFIX!! N°7630 - Fix wrong enum/ext. key value selected when clicking on drop down list in modal
onDropdownOpen: function (oDropdownElem) { onDropdownOpen: function (oDropdownElem) {
me.UpdateDropdownPosition(this.$control, oDropdownElem); me.UpdateDropdownPosition(this.$control, oDropdownElem);
}, },