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

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

Browse Source 
# Conflicts:
#	core/designdocument.class.inc.php
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
This commit is contained in:
Eric Espie
2024-03-19 14:06:24 +01:00
parent 193af6c759 2f30a0146e
commit 6098842d9f
16 changed files with 3223 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/icon_select.js
View File

@@ -214,7 +214,7 @@ $(function()
_upload_dlg: function()
{
var me = this;
this.oUploadDlg = $('<div><p>'+this.options.labels['pick_icon_file']+'</p><p><input type="file" name="file" id="file"/></p></div>');
this.oUploadDlg = $('<div><p>'+this.options.labels['pick_icon_file']+'</p><p><input type="file" accept="image/*" name="file" id="file"/></p></div>');
this.element.after(this.oUploadDlg);
$('input[type=file]').bind('change', function() { me._do_upload(); });
this.oUploadDlg.dialog({
@@ -281,13 +281,13 @@ $(function()
},
_on_upload_error: function(data, status, e)
{
if(data.responseText.indexOf('login-body') !== false)
{
if (data.responseText.indexOf('login-body') !== -1) {
alert('Sorry, your session has expired. In order to continue, the whole page has to be loaded again.');
this.oUploadDlg.dialog('close');
}
else
{
} else if (data.responseText.length > 0) {
alert(data.responseText);
this.oUploadDlg.dialog('close');
} else {
alert(e);
this.oUploadDlg.closest('.ui-dialog').find('.ui-button').button('enable');
}