Merge pull request #87 from visualpython/release

minjk-bl · web-flow · commit a22dc2bca076 · 2021-08-30T17:32:52.000+09:00
Release v1.1.9 (Hotfix version for 1.1.8)
diff --git a/src/api_block/blockContainer.js b/src/api_block/blockContainer.js
@@ -2649,7 +2649,7 @@ define([
         this.hideOptionPreviewBox();
         $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_PREVIEW_BUTTON).removeClass('enabled');
 
-        this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.8');
+        this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.9');
         this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);
         $('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);
     }
diff --git a/src/api_block/index.html b/src/api_block/index.html
@@ -175,7 +175,7 @@
                          id='vp_apiblock_option_page'>
                         <div class="vp-apiblock-option-navigator">
                             <div class="vp-apiblock-option-navigator-label">
-                                <span class="vp-orange-text">Visual Python 1.1.8</span>
+                                <span class="vp-orange-text">Visual Python 1.1.9</span>
                             </div>
                             <div class="vp-apiblock-option-new-to-save" title="something modified...">
 
diff --git a/src/api_block/init.js b/src/api_block/init.js
@@ -303,14 +303,22 @@ define([
 
             var createdBlock = blockContainer.getSelectBlock();
             if (createdBlock) {
-                // apply to original block
-                createdBlock.setState({
-                    apps: {
-                        menu: blockContainer.apps,
-                        code: code,
-                        state: state
-                    }
-                });
+                if (title === 'Snippets') {
+                    // set code
+                    createdBlock.setState({
+                        [STATE_codeLine]: code
+                    });
+                } else if (title === 'Import' || title === 'Variables' || title === 'File' 
+                || title === 'Instance' || title === 'Chart') {
+                    // apply to original block
+                    createdBlock.setState({
+                        apps: {
+                            menu: blockContainer.apps,
+                            code: code,
+                            state: state
+                        }
+                    });
+                }
                 createdBlock.saveState();
             } else {
                 if (title === 'Snippets') {
diff --git a/src/common/constant.js b/src/common/constant.js
@@ -48,7 +48,7 @@ define ([
      * toolbar btn properties
      */
     const TOOLBAR_BTN_INFO = {
-        HELP: "Visual Python 1.1.8"
+        HELP: "Visual Python 1.1.9"
         // , ICON: "fa-angellist"
         , ICON: "vp-main-icon"
         , ID: "vpBtnToggle"
diff --git a/src/common/vpFrameEditor.js b/src/common/vpFrameEditor.js
@@ -563,7 +563,7 @@ define([
         var suggestInput = new vpSuggestInputText.vpSuggestInputText();
         suggestInput.setComponentID('vp_popupAddApply');
         suggestInput.addClass('vp-input vp-popup-apply-lambda');
-        suggestInput.setSuggestList(function() { return ['x', 'min(x)', 'max(x)', 'sum(x)', 'mean(x)']; });
+        suggestInput.setSuggestList(function() { return ['x']; });
         suggestInput.setValue('x');
         suggestInput.setNormalFilter(false);
         content.appendFormatLine('<td>{0}</td>', suggestInput.toTagString());
diff --git a/src/file_io/udf.js b/src/file_io/udf.js
@@ -220,7 +220,7 @@ define([
                         '        return 0.0',
                         '    else:',
                         '        try:',
-                        '        result = float(x)',
+                        '            result = float(x)',
                         '            return result',
                         '        except ValueError:',
                         '            return 0.0'

Original file line number	Diff line number	Diff line change
`@@ -2649,7 +2649,7 @@ define([`
`2649`	`2649`	`this.hideOptionPreviewBox();`
`2650`	`2650`	`$(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_PREVIEW_BUTTON).removeClass('enabled');`
`2651`	`2651`
`2652`		`- this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.8');`
	`2652`	`+ this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.9');`
`2653`	`2653`	`this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);`
`2654`	`2654`	`$('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);`
`2655`	`2655`	`}`