Fix bug on Frame app

minjk-bl · minjk-bl · commit 369ab2bcb303 · 2022-06-21T18:09:43.000+09:00
diff --git a/js/m_apps/Frame.js b/js/m_apps/Frame.js
@@ -107,12 +107,13 @@ define([
                     that.state.originObj = origin;
                     that.state.tempObj = '_vp';
                     that.state.returnObj = that.state.tempObj;
-                    that.state.inplace = false;
+                    if (that.state.inplace === true) {
+                        that.state.returnObj = origin;
+                    }
                     that.initState();
 
                     // reset return obj
-                    $(that.wrapSelector('#vp_feReturn')).val(that.state.tempObj);
-                    $(that.wrapSelector('#inplace')).prop('checked', false);
+                    $(that.wrapSelector('#vp_feReturn')).val(that.state.returnObj);
     
                     // reset table
                     $(that.wrapSelector('.' + VP_FE_TABLE)).replaceWith(function() {
@@ -514,14 +515,15 @@ define([
             super.render();
 
             var {
+                originObj,
                 returnObj,
                 inplace,
                 steps
             } = this.state;
 
             this.loadVariableList();
     
-            $(this.wrapSelector('#vp_feVariable')).val(this.state.originObj);
+            $(this.wrapSelector('#vp_feVariable')).val(originObj);
     
             $(this.wrapSelector('#vp_feReturn')).val(returnObj);
 
@@ -1485,7 +1487,11 @@ define([
                             that.loadInfo();
                             // add to stack
                             if (codeStr !== '') {
-                                that.state.steps.push(codeStr);
+                                let newSteps = codeStr.split('\n');
+                                that.state.steps = [
+                                    ...that.state.steps,
+                                    ...newSteps
+                                ]
                                 var replacedCode = codeStr.replaceAll(that.state.tempObj, that.state.returnObj);
                                 that.setPreview(replacedCode);
                             }
@@ -1509,7 +1515,10 @@ define([
             }).catch(function(resultObj) {
                 let { result, type, msg } = resultObj;
                 vpLog.display(VP_LOG_TYPE.ERROR, result.ename + ': ' + result.evalue, msg, code.toString());
-                com_util.renderAlertModal(result.ename + ': ' + result.evalue);
+                if (that.isHidden() == false) {
+                    // show alert modal only if this popup is visible
+                    com_util.renderAlertModal(result.ename + ': ' + result.evalue);
+                }
                 that.loading = false;
             });
     
