Merge pull request 'Macros: Add handler for run button' (#163) from f…

…eature/run-in-macros into release/v8.3.0
ONLYOFFICE · Dec 6, 2024 · 9418bb8 · 9418bb8
2 parents a1d0f96 + 800ef53
commit 9418bb8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/apps/common/main/lib/view/MacrosDialog.js b/apps/common/main/lib/view/MacrosDialog.js
@@ -139,7 +139,8 @@ define([], function () {
                 cls: 'btn-toolbar borders--small',
                 iconCls: 'icon toolbar__icon btn-run',
                 hint: this.tipMacrosRun
-            });
+            }).on('click', _.bind(this.onRunMacros, this));
+
             this.btnMacrosAdd = new Common.UI.Button({
                 parentEl: $('#btn-macros-add'),
                 cls: 'btn-toolbar borders--small',
@@ -260,7 +261,10 @@ define([], function () {
                 var selectedItem = me._state.currentElementMode === me.CurrentElementModeType.Macros
                     ? me.listMacros.getSelectedRec()
                     : me.listFunctions.getSelectedRec();
-                selectedItem && selectedItem.set('value', value);
+                if(selectedItem) {
+                    me._state.currentValue = value;
+                    selectedItem.set('value', value);
+                }
             });
             this.codeEditor.on('mouseup', function(x, y) {
                 if (me.binding.dragStop) me.binding.dragStop();