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

Activity panel: Set focus in input when clicking on "Compose" button

Browse Source
This commit is contained in:
Molkobain
2021-02-24 17:32:43 +01:00
parent 4d78f4b535
commit ad7b78b871
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/layouts/activity-panel/activity-panel.js
View File

@@ -235,8 +235,6 @@ $(function()
if(sTabType === 'caselog')
{
const sCaselogAttCode = oTabTogglerElem.attr('data-caselog-attribute-code');
this.element.find(this.js_selectors.tab_toolbar + '[data-tab-type="caselog"][data-caselog-attribute-code="' + sCaselogAttCode + '"]').addClass(this.css_classes.is_active);
this._ShowCaseLogTab(sCaselogAttCode);
}
else
@@ -305,6 +303,7 @@ $(function()
if (this.enums.tab_types.caselog === oActiveTabData.type) {
this._ShowCaseLogTab(oActiveTabData.att_code);
this._ShowCaseLogsEntryForms();
this._SetFocusInCaseLogEntryForm(oActiveTabData.att_code);
}
// Else if on the activity tab, check which case log tab to go to
else {
@@ -473,29 +472,33 @@ $(function()
* @returns {Object} Active tab toolbar jQuery element
* @private
*/
_GetActiveTabToolbarElement: function()
{
_GetActiveTabToolbarElement: function() {
const oActiveTabData = this._GetActiveTabData();
let sSelector = this.js_selectors.tab_toolbar + '[data-tab-type="' + oActiveTabData.type + '"]';
let sSelector = this.js_selectors.tab_toolbar+'[data-tab-type="'+oActiveTabData.type+'"]';
if (this.enums.tab_types.caselog === oActiveTabData.type) {
sSelector += '[data-caselog-attribute-code="' + oActiveTabData.att_code + '"]';
sSelector += '[data-caselog-attribute-code="'+oActiveTabData.att_code+'"]';
}
return this.element.find(sSelector);
},
_ShowCaseLogTab: function(sCaseLogAttCode)
{
/**
* Show the case log tab of sCaseLogAttCode and applies its filters
* Note: It doesn't open the entry form
*
* @param sCaseLogAttCode {string}
* @return {void}
* @private
*/
_ShowCaseLogTab: function (sCaseLogAttCode) {
this.element.find(this.js_selectors.tab_toolbar+'[data-tab-type="caselog"][data-caselog-attribute-code="'+sCaseLogAttCode+'"]').addClass(this.css_classes.is_active);
// Show only entries from this case log
// this._HideAllEntries();
//this.element.find(this.js_selectors.entry+'[data-entry-caselog-attribute-code="'+sCaseLogAttCode+'"]').removeClass(this.css_classes.is_hidden);
this._ShowAllEntries();
this._ApplyEntriesFilters();
},
_ShowActivityTab: function()
{
_ShowActivityTab: function () {
// Show all entries but regarding the current filters
//this._OpenAllMessages();
this._ShowAllEntries();
this._ApplyEntriesFilters();
},
@@ -580,15 +583,17 @@ $(function()
*
* @private
*/
_HideAllFiltersOptions: function()
{
_HideAllFiltersOptions: function () {
const me = this;
this.element.find(this.js_selectors.activity_filter_options_toggler).each(function(){
this.element.find(this.js_selectors.activity_filter_options_toggler).each(function () {
me._HideFilterOptions($(this));
});
},
// - Helpers on case logs entry forms
_SetFocusInCaseLogEntryForm: function (sCaseLogAttCode) {
this.element.find(this.js_selectors.caselog_entry_form+'[data-attribute-code="'+sCaseLogAttCode+'"]').trigger('set_focus.caselog_entry_form.itop');
},
/**
* Show all case logs entry forms.
* Event is triggered on the corresponding elements.
@@ -596,8 +601,7 @@ $(function()
* @return {void}
* @private
*/
_ShowCaseLogsEntryForms: function()
{
_ShowCaseLogsEntryForms: function () {
this.element.find(this.js_selectors.caselog_entry_form).trigger('show_form.caselog_entry_form.itop');
this.element.find(this.js_selectors.compose_button).addClass(this.css_classes.is_hidden);
},

4
js/layouts/activity-panel/caselog-entry-form.js
View File

@@ -159,6 +159,10 @@ $(function() {
this.element.on('clear_entry.case_entry_form.itop', function () {
me._EmptyInput();
});
// Set focus in the input
this.element.on('set_focus.caselog_entry_form.itop', function () {
me._GetCKEditorInstance().focus();
});
},
// Helpers