Edit to save last action as a default run type

minjk-bl · minjk-bl · commit bd5595ba5219 · 2023-09-18T09:17:08.000+09:00
diff --git a/visualpython/css/component/popupComponent.css b/visualpython/css/component/popupComponent.css
@@ -525,7 +525,7 @@
     height: 25px;
 }
 .vp-popup-frame .vp-accordian-box {
-    padding: 0px 15px 15px 0px;
+    padding: 0px 15px 0px 0px;
 }
 
 /* resizable handler */
diff --git a/visualpython/js/com/component/PopupComponent.js b/visualpython/js/com/component/PopupComponent.js
@@ -487,22 +487,7 @@ define([
                          // set run button
                         vpConfig.getData('runType', 'vpcfg').then(function(data) {
                             vpLog.display(VP_LOG_TYPE.DEVELOP, 'Runtype get data', data);
-                            if (data == undefined || data == null || data === '') {
-                                data = 'run'; // default = run
-                            }
-                            that.config.runType = data;
-                            $(that.wrapSelector(`.vp-popup-run-type[value="${data}"]`)).prop('checked', true);
-                            $(that.wrapSelector('.vp-popup-run-button')).attr('data-type', data);
-                            let runTitle = 'Run code';
-                            switch (data) {
-                                case 'run-save':
-                                    runTitle = 'Save to block & Run code';
-                                    break;
-                                case 'add':
-                                    runTitle = 'Add code to cell';
-                                    break;
-                            }
-                            $(that.wrapSelector('.vp-popup-run-button')).prop('title', runTitle);
+                            that._setDefaultRunType(data);
                         });
                         evt.stopPropagation();
                         break;
@@ -527,24 +512,15 @@ define([
             // Click detail radio
             $(this.wrapSelector('.vp-popup-run-type')).on('click', function(evt) {
                 let runType = $(that.wrapSelector('.vp-popup-run-type[name=runType]:checked')).val();
-                that.config.runType = runType;
                 // save as vpConfig
                 vpConfig.setData({runType: runType}, 'vpcfg');
-                $(that.wrapSelector('.vp-popup-run-button')).attr('data-type', runType);
-                let runTitle = 'Run code';
-                switch (runType) {
-                    case 'run-save':
-                        runTitle = 'Save to block & Run code';
-                        break;
-                    case 'add':
-                        runTitle = 'Add code to cell';
-                        break;
-                }
-                $(that.wrapSelector('.vp-popup-run-button')).prop('title', runTitle);
+                that._setDefaultRunType(runType);
             });
             // Click detail buttons
             $(this.wrapSelector('.vp-popup-detail-action-button')).on('click', function(evt) {
                 var btnType = $(this).data('type');
+                vpConfig.setData({runType: runType}, 'vpcfg');
+                that._setDefaultRunType(btnType); // run, run-save, add
                 switch(btnType) {
                     // case 'apply':
                     //     that.save();
@@ -749,22 +725,7 @@ define([
                 let that = this;
                 vpConfig.getData('runType', 'vpcfg').then(function(data) {
                     vpLog.display(VP_LOG_TYPE.DEVELOP, 'Runtype get data', data);
-                    if (data == undefined || data == null || data === '') {
-                        data = 'run'; // default = run
-                    }
-                    that.config.runType = data;
-                    $(that.wrapSelector(`.vp-popup-run-type[value="${data}"]`)).prop('checked', true);
-                    $(that.wrapSelector('.vp-popup-run-button')).attr('data-type', data);
-                    let runTitle = 'Run code';
-                    switch (data) {
-                        case 'run-save':
-                            runTitle = 'Save to block & Run code';
-                            break;
-                        case 'add':
-                            runTitle = 'Add code to cell';
-                            break;
-                    }
-                    $(that.wrapSelector('.vp-popup-run-button')).prop('title', runTitle);
+                    that._setDefaultRunType(data);
                 });
             }
             
@@ -911,6 +872,25 @@ define([
             vpLog.display(VP_LOG_TYPE.DEVELOP, 'savedState', that.state);   
         }
 
+        _setDefaultRunType(runType) {
+            if (runType == undefined || runType == null || runType === '') {
+                runType = 'run'; // default = run
+            }
+            this.config.runType = runType;
+            $(this.wrapSelector(`.vp-popup-run-type[value="${runType}"]`)).prop('checked', true);
+            $(this.wrapSelector('.vp-popup-run-button')).attr('data-type', runType);
+            let runTitle = 'Run code'; // when runType is 'run'
+            switch (runType) {
+                case 'run-save':
+                    runTitle = 'Save to block & Run code';
+                    break;
+                case 'add':
+                    runTitle = 'Add code to cell';
+                    break;
+            }
+            $(this.wrapSelector('.vp-popup-run-button')).prop('title', runTitle);
+        }
+
         _getTagValue(tag) {
             let id = tag.id;
             let tagName = $(tag).prop('tagName'); // returns with UpperCase

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@`
`525`	`525`	`height: 25px;`
`526`	`526`	`}`
`527`	`527`	`.vp-popup-frame .vp-accordian-box {`
`528`		`- padding: 0px 15px 15px 0px;`
	`528`	`+ padding: 0px 15px 0px 0px;`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`/* resizable handler */`