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

(retrofit from trunk) N. 533: when reloading the ticket form (due to an alternate initial state path)

Browse Source 
1) the value of some controls (non-text inputs in n:n links) was not preserved,
2) popup dialogs and CKEditor instances were not properly destroyed and re-created.

SVN:2.3[4516]
This commit is contained in:
Denis Flaven
2016-12-13 10:56:03 +00:00
parent c0ba515797
commit 15f900e630
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/linkswidget.js
View File

@@ -16,6 +16,11 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
$('#linkedset_'+this.id+' .selection').each( function() { this.checked = false; }); $('#linkedset_'+this.id+' .selection').each( function() { this.checked = false; });
$('#'+this.id+'_btnRemove').attr('disabled','disabled'); $('#'+this.id+'_btnRemove').attr('disabled','disabled');
$('#'+this.id+'_linksToRemove').val(''); $('#'+this.id+'_linksToRemove').val('');
$('#linkedset_'+me.id).on('remove', function() {
// prevent having the dlg div twice
$('#dlg_'+me.id).remove();
});
}; };
this.RemoveSelected = function() this.RemoveSelected = function()
@@ -294,7 +299,7 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
this.GetUpdatedValue = function() this.GetUpdatedValue = function()
{ {
var sSelector = '#linkedset_'+me.id+' input[name^=attr_'+me.id+']'; var sSelector = '#linkedset_'+me.id+' :input[name^=attr_'+me.id+']';
var aIndexes = []; var aIndexes = [];
var aValues = []; var aValues = [];
$(sSelector).each(function() { $(sSelector).each(function() {

2
js/wizardhelper.js
View File

@@ -236,7 +236,7 @@ function WizardHelper(sClass, sFormPrefix, sState)
$('#'+sFormId).find('.htmlEditor').each(function() { $('#'+sFormId).find('.htmlEditor').each(function() {
var sId = $(this).attr('id'); var sId = $(this).attr('id');
var editorInst = CKEDITOR.instances[sId]; var editorInst = CKEDITOR.instances[sId];
if (editorInst) if (editorInst.status == 'ready')
{ {
editorInst.destroy(true); editorInst.destroy(true);
} }