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

Advanced search: UI/UX, improve "Add criteria" cinematic.

Browse Source 
SVN:b1162[5536]
This commit is contained in:
Guillaume Lajarige
2018-03-26 15:58:03 +00:00
parent 40dbb2ce17
commit 070ac49d1b
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/search/search_form_handler.js
View File

@@ -177,7 +177,9 @@ $(function()
// - Open it first
this.elements.more_criterion.addClass('opened');
// - Focus filter
this.elements.more_criterion.find('.sf_filter:first input[type="text"]').focus();
this.elements.more_criterion.find('.sf_filter:first input[type="text"]')
.val('')
.focus();
// - Then only check if more menu is to close to the right side (otherwise we might not have the right element's position)
var iFormWidth = this.element.outerWidth();
var iFormLeftPos = this.element.offset().left;
@@ -502,14 +504,22 @@ $(function()
// Prevent propagation to not close the opening criteria
oEvent.stopPropagation();
// Prepare new criterion data (as already opened to increase UX)
var oData = {
'ref': $(this).attr('data-field-ref'),
'init_opened': (oEvent.ctrlKey) ? false : true,
};
// If no checkbox checked, add criteria right away, otherwise we "queue" it we other checkboxed.
if(me.elements.more_criterion.find('.sfm_field input[type="checkbox"]:checked').length === 0)
{
// Prepare new criterion data (as already opened to increase UX)
var oData = {
'ref': $(this).attr('data-field-ref'),
'init_opened': (oEvent.ctrlKey) ? false : true,
};
// Add criteria but don't submit form as the user has not specified the value yet.
me._addCriteria(oData);
// Add criteria but don't submit form as the user has not specified the value yet.
me._addCriteria(oData);
}
else
{
$(this).find('input[type="checkbox"]').prop('checked', !$(this).find('input[type="checkbox"]').prop('checked'));
}
});
// - Add several criterion