From 8a350ff977970cdc4c31360d7b7ff7c6d893fe0d Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 28 Sep 2023 02:07:12 +0300 Subject: [PATCH 1/5] bug 64347 --- apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index ed97c83ac4..5b691a91dd 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -579,7 +579,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa var me = this, i = item.get('ruleIndex'), - cmpEl = this.rulesList.cmpEl.find('#format-manager-item-' + i); + cmpEl = this.rulesList.cmpEl.find('#format-manager-item-' + i).on('dblclick', _.bind( this.onEditRule, this, true)); if (!this.rules[i]) this.rules[i] = {}; var rule = this.rules[i]; From 6a0bc959b76c9444d8b230b7b73cb0b66d95398a Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 20 Oct 2023 20:28:11 +0300 Subject: [PATCH 2/5] bug 64347 add exception --- apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index 5b691a91dd..7c23ddd66a 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -580,6 +580,9 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa var me = this, i = item.get('ruleIndex'), cmpEl = this.rulesList.cmpEl.find('#format-manager-item-' + i).on('dblclick', _.bind( this.onEditRule, this, true)); + + this.rulesList.cmpEl.find('#format-manager-txt-rule-' +i).on('dblclick', function (e){e.stopPropagation();}); + if (!this.rules[i]) this.rules[i] = {}; var rule = this.rules[i]; From 4cf14533b88e0897198d9d56c407b08985b90473 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Sun, 22 Oct 2023 05:11:42 +0300 Subject: [PATCH 3/5] bug 64347 refactoring --- .../main/app/view/FormatRulesManagerDlg.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index 7c23ddd66a..eb2a182ba3 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -179,7 +179,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa }; this.rulesList.on('item:select', _.bind(this.onSelectRule, this)) .on('item:keydown', _.bind(this.onKeyDown, this)) - .on('item:keyup', _.bind(this.onKeyUp, this)); + .on('item:keyup', _.bind(this.onKeyUp, this)) + .on('item:dblclick', _.bind(this.onEditRule, this,true)); this.btnNew = new Common.UI.Button({ el: $('#format-manager-btn-new') @@ -579,9 +580,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa var me = this, i = item.get('ruleIndex'), - cmpEl = this.rulesList.cmpEl.find('#format-manager-item-' + i).on('dblclick', _.bind( this.onEditRule, this, true)); - - this.rulesList.cmpEl.find('#format-manager-txt-rule-' +i).on('dblclick', function (e){e.stopPropagation();}); + cmpEl = this.rulesList.cmpEl.find('#format-manager-item-' + i); if (!this.rules[i]) this.rules[i] = {}; @@ -608,6 +607,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa } }).on('button:click', _.bind(this.onSelectData, this, rule, item)); + input.cmpEl.on('dblclick', 'input', function (e){e.stopPropagation();}); Common.UI.FocusManager.add(this, input); var val = item.get('range'); From d7ca80be1a5b30336bf0081cad8585943c47f6a7 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Sat, 11 Nov 2023 20:27:31 +0300 Subject: [PATCH 4/5] bug 64347 entervalue --- apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index eb2a182ba3..ca3deb56f0 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -180,7 +180,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa this.rulesList.on('item:select', _.bind(this.onSelectRule, this)) .on('item:keydown', _.bind(this.onKeyDown, this)) .on('item:keyup', _.bind(this.onKeyUp, this)) - .on('item:dblclick', _.bind(this.onEditRule, this,true)); + .on('item:dblclick', _.bind(this.onEditRule, this,true)) + .on('entervalue', _.bind(this.onEditRule, this, true));; this.btnNew = new Common.UI.Button({ el: $('#format-manager-btn-new') From ea2ccb3f4f228cafc4fac845e66dc67c47deb721 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 15 Nov 2023 19:07:42 +0300 Subject: [PATCH 5/5] bug 64347 --- apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js index ca3deb56f0..465d3065e3 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js @@ -181,7 +181,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa .on('item:keydown', _.bind(this.onKeyDown, this)) .on('item:keyup', _.bind(this.onKeyUp, this)) .on('item:dblclick', _.bind(this.onEditRule, this,true)) - .on('entervalue', _.bind(this.onEditRule, this, true));; + .on('entervalue', _.bind(function (e) {!!e.store.length && this.onEditRule(true);},this)); this.btnNew = new Common.UI.Button({ el: $('#format-manager-btn-new')