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

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

Browse Source
This commit is contained in:
Eric Espie
2022-03-03 10:23:38 +01:00
parent 9ce88699ca 4fdbec72d4
commit 4bdf84bf6c
54 changed files with 631 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/extkeywidget.js
View File

@@ -25,8 +25,10 @@ Selectize.define('custom_itop', function(aOptions) {
if (this.$control_input.val() === '' && !this.$activeItems.length) {
iIndex = this.caretPos-1;
if (iIndex >= 0 && iIndex < this.items.length) {
let sPreviousValue = this.options[this.items[iIndex]].search_label;
this.clear(true);
e.preventDefault();
this.setTextboxValue(sPreviousValue.slice(0, -1));
return;
}
}

8
js/pages/backoffice/toolbox.js
View File

@@ -17,10 +17,16 @@
*/
// Helpers
function ShowAboutBox()
function ShowAboutBox(sTitle)
{
var loadingDialog = $('<div style="padding-top:40px; padding-left:40px;"><i class="fa fa-sync-alt fa-spin fa-x fa-fw"></i></div>');
loadingDialog.dialog( {title:sTitle,autoOpen: true, modal: true});
$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'about_box'}, function(data){
$('body').append(data);
}).always(function() {
loadingDialog.empty();
loadingDialog.remove();
});
return false;
}