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

#1011 Proper resizing of the dialog box for managing 1:n links - removed a trace - retrofit from trunk.

Browse Source 
SVN:2.0.2[3392]
This commit is contained in:
Denis Flaven
2014-10-30 08:58:07 +00:00
parent c6d6e85b3d
commit 2d7cdafadc
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/linksdirectwidget.js
View File

@@ -139,7 +139,7 @@ $(function()
this.datatable.tableHover(); this.datatable.tableHover();
this.datatable.find('.selectList'+this.id).bind('change', function() { me._updateButtons(); }); this.datatable.find('.selectList'+this.id).bind('change', function() { me._updateButtons(); });
}, },
_updateDlgSize: function() _updateDlgPosition: function()
{ {
this.oDlg.dialog('option', { position: { my: "center", at: "center", of: window }}); this.oDlg.dialog('option', { position: { my: "center", at: "center", of: window }});
}, },
@@ -171,7 +171,7 @@ $(function()
}); });
me.indicator.html(''); me.indicator.html('');
me.oButtons['create'].removeAttr('disabled'); me.oButtons['create'].removeAttr('disabled');
me._updateDlgSize(); me._updateDlgPosition();
}); });
}, },
_selectToAdd: function() _selectToAdd: function()
@@ -197,20 +197,23 @@ $(function()
me.oDlg.find('form').removeAttr('onsubmit').bind('submit', function() { me._onSearchToAdd(); return false; } ); me.oDlg.find('form').removeAttr('onsubmit').bind('submit', function() { me._onSearchToAdd(); return false; } );
me.oDlg.find('button.cancel').unbind('click').click( function() { me.oDlg.dialog('close'); } ); me.oDlg.find('button.cancel').unbind('click').click( function() { me.oDlg.dialog('close'); } );
me.oDlg.find('button.ok').unbind('click').click( function() { me._onDoAdd(); } ); me.oDlg.find('button.ok').unbind('click').click( function() { me._onDoAdd(); } );
$('#SearchFormToAdd_'+me.id).resize(function() { me._onSearchDlgUpdateSize(); });
me.oDlg.dialog({ me.oDlg.dialog({
title: me.options.labels['selection_title'], title: me.options.labels['selection_title'],
modal: true, modal: true,
width: 'auto', width: $(window).width()*0.8,
height: 'auto', height: $(window).height()*0.8,
maxHeight: $(window).height() - 50, maxHeight: $(window).height() - 50,
position: { my: "center", at: "center", of: window }, position: { my: "center", at: "center", of: window },
close: function() { me._onDlgClose(); } close: function() { me._onDlgClose(); },
resizeStop: function() { me._onSearchDlgUpdateSize(); }
}); });
me.indicator.html(''); me.indicator.html('');
me.oButtons['add'].removeAttr('disabled'); me.oButtons['add'].removeAttr('disabled');
me._onSearchToAdd(); me._onSearchToAdd();
me._updateDlgSize(); me._updateDlgPosition();
me._onSearchDlgUpdateSize();
}); });
}, },
_onSearchToAdd: function() _onSearchToAdd: function()
@@ -255,8 +258,8 @@ $(function()
me._onUpdateDlgButtons(c); me._onUpdateDlgButtons(c);
}); });
$('#SearchResultsToAdd_'+me.id).unblock(); $('#SearchResultsToAdd_'+me.id).unblock();
me._onSearchDlgUpdateSize();
}); });
//alert("C'est parti mon kiki !");
return false; // Stay on the page, no submit return false; // Stay on the page, no submit
}, },
_getSelection: function(sName) _getSelection: function(sName)
@@ -373,7 +376,7 @@ $(function()
me.oDlg.html(data); me.oDlg.html(data);
me.oDlg.find('form').removeAttr('onsubmit').bind('submit', function() { me._onCreateRow(); return false; } ); me.oDlg.find('form').removeAttr('onsubmit').bind('submit', function() { me._onCreateRow(); return false; } );
me.oDlg.find('button.cancel').unbind('click').click( function() { me.oDlg.dialog('close'); } ); me.oDlg.find('button.cancel').unbind('click').click( function() { me.oDlg.dialog('close'); } );
me._updateDlgSize(); me._updateDlgPosition();
}); });
}, },
_onCreateRow: function() _onCreateRow: function()
@@ -426,6 +429,13 @@ $(function()
this.oDlg.remove(); this.oDlg.remove();
this.oDlg = null; this.oDlg = null;
}, },
_onSearchDlgUpdateSize: function()
{
var searchHeight = $('#SearchFormToAdd_'+this.id).outerHeight();
var dlgHeight = this.oDlg.height();
$('.wizContainer', this.oDlg).height(dlgHeight - 20);
$('#SearchResultsToAdd_'+this.id).height(dlgHeight - 50 - searchHeight);
},
_deleteRow: function(oCheckbox) _deleteRow: function(oCheckbox)
{ {
var iObjKey = parseInt(oCheckbox.val(), 10); // Number in base 10 var iObjKey = parseInt(oCheckbox.val(), 10); // Number in base 10