Confirmation added before New Note operation

minjk-bl · minjk-bl · commit cd2f7b793c9e · 2021-07-14T15:09:48.000+09:00
diff --git a/src/api_block/component/boardMenuBar.js b/src/api_block/component/boardMenuBar.js
@@ -32,7 +32,7 @@ define([
             , STR_OPACITY
             , STR_UNTITLED } = constData;
 
-    const { saveNotePageAction_newVersion } = vpContainer;
+    const { saveAsNotePage, saveNotePageAction_newVersion } = vpContainer;
 
     var apiBlockMenuInit = function(blockContainer) {
         var apiBlockMenuBarDom;
@@ -144,34 +144,40 @@ define([
             $(apiBlockMenuBarDom).remove(); 
 
             var blockList = blockContainer.getBlockList();
-            if (blockList.length == 0) {
-                return;
-            }
+            // if (blockList.length == 0) {
+            //     return;
+            // }
 
             /** 빈 string이거나 
              *  Untitled이면 File navigation을 open */
             var saveFileName = $(VP_ID_PREFIX + VP_ID_APIBLOCK_BOARD_MAKE_NODE_BLOCK_INPUT).val();
-            if ( saveFileName == STR_EMPTY
-                || saveFileName == STR_UNTITLED) {
+            if ( blockList.length == 0 
+                && (saveFileName == STR_EMPTY
+                || saveFileName == STR_UNTITLED)) {
                 blockContainer.deleteAllBlock();
                 blockContainer.setIsMenubarOpen(false);
                 return;
             }
 
-            var saveFilePath = vpCommon.formatString("./{0}.{1}", saveFileName, vpConst.VP_NOTE_EXTENSION);
+            var saveFilePath = $(vpCommon.wrapSelector(vpCommon.formatString("#{0}", vpConst.VP_NOTE_REAL_FILE_PATH))).val();
             var apiBlockPackage = blockContainer.getImportPackageThis();
             apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}.vp'`,['Yes', 'No', 'Cancel'], [() => {
-                saveNotePageAction_newVersion(vpCommon.formatString("{0}.{1}", saveFileName, vpConst.VP_NOTE_EXTENSION), saveFilePath);
+                if (saveFilePath == '') {
+                    saveAsNotePage();
+                } else {
+                    vpCommon.formatString("./{0}.{1}", saveFileName, vpConst.VP_NOTE_EXTENSION);
+                    saveNotePageAction_newVersion(vpCommon.formatString("{0}.{1}", saveFileName, vpConst.VP_NOTE_EXTENSION), saveFilePath);
+                }
 
                 blockContainer.deleteAllBlock();
                 // clear file and path
-                $('#vp_apiblock_board_makenode_input').val('Untitled');
+                $('#vp_apiblock_board_makenode_input').val(STR_UNTITLED);
                 $('#vp_apiblock_board_makenode_path').val('');
     
             },() => {
                 blockContainer.deleteAllBlock();
                 // clear file and path
-                $('#vp_apiblock_board_makenode_input').val('Untitled');
+                $('#vp_apiblock_board_makenode_input').val(STR_UNTITLED);
                 $('#vp_apiblock_board_makenode_path').val('');
     
             },() => {
diff --git a/src/api_block/init.js b/src/api_block/init.js
@@ -553,7 +553,7 @@ define([
             // });
         });
 
-        /** +node 블럭 생성 버튼 클릭 함수 바인딩 */
+        /** +code 블럭 생성 버튼 클릭 함수 바인딩 */
         $(document).on(STR_CLICK, VP_ID_PREFIX + VP_ID_APIBLOCK_NODE_BLOCK_PLUS_BUTTON, function() {
             // blockContainer.createNodeBlock(true);
             // +code 블럭 생성
@@ -729,14 +729,8 @@ define([
             if (e.file.substring(e.file.lastIndexOf(".") + 1) === vpConst.VP_NOTE_EXTENSION) {
                 var selectedPath = $(vpCommon.wrapSelector(vpCommon.formatString("#{0}", vpConst.VP_NOTE_REAL_FILE_PATH))).val();
                 var saveFileName = selectedPath.substring(selectedPath.lastIndexOf("/") + 1);
-                // FIXME: 여기부분 수정해야 함
-                saveNotePageAction_newVersion(saveFileName, selectedPath);
-                // apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}'`,['Yes','No', 'Cancel'], [() => {
-                // },() => {
-
-                // },() => {
 
-                // }]);
+                saveNotePageAction_newVersion(saveFileName, selectedPath);
             }
         });
 
