Merge pull request visualpython#17 from visualpython/devops

minjk-bl · web-flow · commit 9aacd62d017c · 2021-05-10T17:24:45.000+09:00
Devops merge
diff --git a/src/api_block/blockContainer.js b/src/api_block/blockContainer.js
@@ -261,6 +261,9 @@ define([
                 this.reRenderAllBlock_asc();
                 this.resetBlockListAndRenderThisBlock(block);
             }
+            return block;
+        } else {
+            return null;
         }
     }
 
@@ -289,6 +292,9 @@ define([
                     this.resetOptionPage();
                     this.reRenderAllBlock_asc();
                 }
+                return block;
+            } else {
+                return null;
             }
             
     }
@@ -298,8 +304,6 @@ define([
         var passChecking = false;
         if (block) {
             if (block.isModified) {
-                // set apply button enabled
-                $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).removeClass('disabled');
                 // show title alert
                 $(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'block');
             } else {
@@ -338,20 +342,16 @@ define([
                         block.state_backup['isFinally'] = nowState['isFinally'];
                 }
                 if (!passChecking && JSON.stringify(nowState) != JSON.stringify(block.state_backup)) {
-                    // set apply button enabled
-                    $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).removeClass('disabled');
                     // show title alert
                     $(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'block');
 
                     // set this block to isModified = true
                     block.isModified = true;
                 } else {
-                    $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).addClass('disabled');
                     $(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'none');
                 }
             }
         } else {
-            $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).addClass('disabled');
             $(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'none');
         }
     }
diff --git a/src/api_block/index.html b/src/api_block/index.html
@@ -37,7 +37,7 @@
                                                  vp-accordion-caption'
                                             data-category="api">Library
                                     </div> 
-                                    <div class='vp-block-group-box vp-block-group-box-api' style="display:none;">
+                                    <div class='vp-block-group-box vp-block-group-box-api'>
 
                                     </div>
 
@@ -142,7 +142,7 @@
                             <div id="vp_apiblock_board_option_cancel_button" class="vp-button cancel vp-apiblock-option-button vp-apiblock-option-cancel-button">
                             Cancel
                             </div>
-                            <div id="vp_apiblock_board_option_apply_button" class="vp-button disabled activated vp-apiblock-option-button vp-apiblock-option-apply-button">
+                            <div id="vp_apiblock_board_option_apply_button" class="vp-button activated vp-apiblock-option-button vp-apiblock-option-apply-button">
                             Apply
                             </div>
                         </div>
diff --git a/src/api_block/init.js b/src/api_block/init.js
@@ -443,12 +443,16 @@ define([
 
         /** option page - apply 버튼 클릭 함수 바인딩 */
         $(document).on(STR_CLICK, VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON, function() {
-            // if disabled, do nothing
-            if ($(this).hasClass('disabled')) {
-                return;
-            }
+            var appliedBlock = blockContainer.applyBlock();
+
+            if (appliedBlock) {
+                // #11 applied! popup
+                vpCommon.renderSuccessMessage('Applied!');
 
-            blockContainer.applyBlock();
+                // #10 scroll to selected/applied block
+                var appliedBlockDom = appliedBlock.getBlockMainDom();
+                $(VP_CLASS_PREFIX + VP_CLASS_APIBLOCK_BOARD).animate({scrollTop: $(appliedBlockDom).position().top}, "fast");
+            }
         });
 
         /**
@@ -601,7 +605,8 @@ define([
             if (libObj._name != undefined) {
                 if (libObj._level == 0) {
                     var open = false;
-                    if (libObj._name == 'Common') {
+                    if (libObj._name == 'Common'
+                        || libObj._name == 'Pandas') {
                         // Common은 처음에 열어놓고 시작
                         open = true;
                     }

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,9 @@ define([`
`261`	`261`	`this.reRenderAllBlock_asc();`
`262`	`262`	`this.resetBlockListAndRenderThisBlock(block);`
`263`	`263`	`}`
	`264`	`+ return block;`
	`265`	`+ } else {`
	`266`	`+ return null;`
`264`	`267`	`}`
`265`	`268`	`}`
`266`	`269`
`@@ -289,6 +292,9 @@ define([`
`289`	`292`	`this.resetOptionPage();`
`290`	`293`	`this.reRenderAllBlock_asc();`
`291`	`294`	`}`
	`295`	`+ return block;`
	`296`	`+ } else {`
	`297`	`+ return null;`
`292`	`298`	`}`
`293`	`299`
`294`	`300`	`}`
`@@ -298,8 +304,6 @@ define([`
`298`	`304`	`var passChecking = false;`
`299`	`305`	`if (block) {`
`300`	`306`	`if (block.isModified) {`
`301`		`- // set apply button enabled`
`302`		`- $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).removeClass('disabled');`
`303`	`307`	`// show title alert`
`304`	`308`	`$(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'block');`
`305`	`309`	`} else {`
`@@ -338,20 +342,16 @@ define([`
`338`	`342`	`block.state_backup['isFinally'] = nowState['isFinally'];`
`339`	`343`	`}`
`340`	`344`	`if (!passChecking && JSON.stringify(nowState) != JSON.stringify(block.state_backup)) {`
`341`		`- // set apply button enabled`
`342`		`- $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).removeClass('disabled');`
`343`	`345`	`// show title alert`
`344`	`346`	`$(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'block');`
`345`	`347`
`346`	`348`	`// set this block to isModified = true`
`347`	`349`	`block.isModified = true;`
`348`	`350`	`} else {`
`349`		`- $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).addClass('disabled');`
`350`	`351`	`$(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'none');`
`351`	`352`	`}`
`352`	`353`	`}`
`353`	`354`	`} else {`
`354`		`- $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_APPLY_BUTTON).addClass('disabled');`
`355`	`355`	`$(VP_CLASS_PREFIX + 'vp-apiblock-option-new-to-save').css('display', 'none');`
`356`	`356`	`}`
`357`	`357`	`}`