diff --git a/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js b/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js index 5fa7ef52f5..63e5c987e0 100644 --- a/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js +++ b/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js @@ -50,13 +50,13 @@ const oOpenSignInWindow = function (url, name) { then we load it in the already opened secondary window, and then we bring such window back on top/in front of its parent window. */ oWindowObjectReference = window.open(url, name, sWindowFeatures); - oWindowObjectReference.trigger('focus'); + oWindowObjectReference.focus(); } else { /* Else the window reference must exist and the window is not closed; therefore, we can bring it back on top of any other window with the focus() method. There would be no need to re-create the window or to reload the referenced resource. */ - oWindowObjectReference.trigger('focus'); + oWindowObjectReference.focus(); } /* Let know every second our child window that we're waiting for it to complete, once we reach our landing page, it'll send us a reply diff --git a/js/ckeditor.handler.js b/js/ckeditor.handler.js index a00a8780fa..02e02c0e28 100644 --- a/js/ckeditor.handler.js +++ b/js/ckeditor.handler.js @@ -58,11 +58,11 @@ const CombodoCKEditorHandler = { // Adjust size if passed in configuration // - Width if (aConfiguration.width !== undefined) { - editor.editing.view.on('change', writer => { writer.setStyle( 'width', aConfiguration.width, editor.editing.view.document.getRoot() ); } ); + editor.editing.view.change( writer => { writer.setStyle( 'width', aConfiguration.width, editor.editing.view.document.getRoot() ); } ); } // - Height if (aConfiguration.height !== undefined) { - editor.editing.view.on('change', writer => { writer.setStyle( 'height', aConfiguration.height, editor.editing.view.document.getRoot() ); } ); + editor.editing.view.change( writer => { writer.setStyle( 'height', aConfiguration.height, editor.editing.view.document.getRoot() ); } ); } this.instances[sElem] = editor; diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php index 97f8cb7e2f..8a64b7b548 100644 --- a/pages/UniversalSearch.php +++ b/pages/UniversalSearch.php @@ -51,7 +51,7 @@ $sOperation = utils::ReadParam('operation', ''); $oP->SetBreadCrumbEntry('ui-tool-universalsearch', Dict::S('Menu:UniversalSearchMenu'), Dict::S('Menu:UniversalSearchMenu+'), '', 'fas fa-search', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES); //$sSearchHeaderForceDropdown -$sSearchHeaderForceDropdown = ''; $aClassLabels = []; foreach (MetaModel::GetClasses('bizmodel, grant_by_profile') as $sCurrentClass) { if ((MetaModel::HasCategory($sCurrentClass, 'grant_by_profile') && UserRights::IsActionAllowed($sCurrentClass, UR_ACTION_BULK_MODIFY)) diff --git a/pages/tagadmin.php b/pages/tagadmin.php index ff12f85773..170d921eb1 100644 --- a/pages/tagadmin.php +++ b/pages/tagadmin.php @@ -54,7 +54,7 @@ try { $oP->SetBreadCrumbEntry('ui-tool-tag-admin', Dict::S('Menu:TagAdminMenu'), Dict::S('Menu:TagAdminMenu+'), '', 'fas fa-tags', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES); - $sSearchHeaderForceDropdown = ''; $aClassLabels = []; foreach (MetaModel::EnumChildClasses($sBaseClass, ENUM_CHILD_CLASSES_EXCLUDETOP) as $sCurrentClass) { $aClassLabels[$sCurrentClass] = MetaModel::GetName($sCurrentClass); diff --git a/templates/base/components/input/select/select.html.twig b/templates/base/components/input/select/select.html.twig index a53d14c055..bb84c454f9 100644 --- a/templates/base/components/input/select/select.html.twig +++ b/templates/base/components/input/select/select.html.twig @@ -5,7 +5,7 @@ {% include "base/components/input/inputlabel.html.twig" %} {% endif %}