Revert "Merge pull request #1647 from blampewpew/feat-save-new-drawin…

…g-to-current-folder"

This reverts commit fa03968, reversing
changes made to 78dace3.

src/lang/locale/en.ts

@@ -128,7 +128,7 @@ export default {
   BASIC_DESC: `In the "Basic" settings, you can configure options such as displaying release notes after updates, receiving plugin update notifications, setting the default location for new drawings, specifying the Excalidraw folder for embedding drawings into active documents, defining an Excalidraw template file, and designating an Excalidraw Automate script folder for managing automation scripts.`,
   FOLDER_NAME: "Excalidraw folder",
   FOLDER_DESC:
-    "Default folder location for new drawings at vault root. <ul><li>If \"./\", drawings will be saved in same folder as the current file.</li> <li>If \"./{folder}\", drawings will be saved to the folder specified in the same folder as the current.</li> <li>If empty, drawings will be created in the Vault root.</li></ul>",
+    "Default location for new drawings. If empty, drawings will be created in the Vault root.",
   CROP_PREFIX_NAME: "Crop file prefix",
   CROP_PREFIX_DESC:
     "The first part of the filename for new drawings created when cropping an image. " +

src/main.ts

@@ -99,7 +99,7 @@ import {
   isCallerFromTemplaterPlugin,
   decompress,
 } from "./utils/Utils";
-import { extractSVGPNGFileName, getActivePDFPageNumberFromPDFView, getAttachmentsFolderAndFilePath, getCurrentActiveDirectory, getNewOrAdjacentLeaf, getParentOfClass, isObsidianThemeDark, openLeaf } from "./utils/ObsidianUtils";
+import { extractSVGPNGFileName, getActivePDFPageNumberFromPDFView, getAttachmentsFolderAndFilePath, getNewOrAdjacentLeaf, getParentOfClass, isObsidianThemeDark, openLeaf } from "./utils/ObsidianUtils";
 import { ExcalidrawElement, ExcalidrawEmbeddableElement, ExcalidrawImageElement, ExcalidrawTextElement, FileId } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { ScriptEngine } from "./Scripts";
 import {
@@ -1094,15 +1094,14 @@ export default class ExcalidrawPlugin extends Plugin {
         this.settings,
       );
       const folder = this.settings.embedUseExcalidrawFolder
-        ? (this.settings.folder && this.settings.folder.startsWith("./")) ? getCurrentActiveDirectory(activeView.file.path, this.settings.folder) : null
+        ? null
         : (
             await getAttachmentsFolderAndFilePath(
               this.app,
               activeView.file.path,
               filename,
             )
           ).folder;
-
       const file = await this.createDrawing(filename, folder);
       await this.embedDrawing(file);
       this.openDrawing(file, location, true, undefined, true);

src/utils/ObsidianUtils.ts

@@ -169,7 +169,9 @@ export const getAttachmentsFolderAndFilePath = async (
   // folder == "folder" save to specific folder in vault
   // folder == "./folder" save to specific subfolder of current active folder
   if (folder && folder.startsWith("./")) {
-    folder = getCurrentActiveDirectory(activeViewFilePath, folder);
+    // folder relative to current file
+    const activeFileFolder = `${splitFolderAndFilename(activeViewFilePath).folderpath}/`;
+    folder = normalizePath(activeFileFolder + folder.substring(2));
   }
   if (!folder || folder === "/") {
     folder = "";
@@ -183,15 +185,6 @@ export const getAttachmentsFolderAndFilePath = async (
   };
 };
 
-export const getCurrentActiveDirectory =(
-    activeViewFilePath: string,
-    folder: string
-) : string => {
-    // folder relative to current file
-    const activeFileFolder = `${splitFolderAndFilename(activeViewFilePath).folderpath}/`;
-    return normalizePath(activeFileFolder + folder.substring(2));
-};
-
 export const isObsidianThemeDark = () => document.body.classList.contains("theme-dark");
 
 export type ConstructableWorkspaceSplit = new (ws: Workspace, dir: "horizontal"|"vertical") => WorkspaceSplit;
@@ -295,4 +288,4 @@ export const openLeaf = ({
   leaf = fnGetLeaf();
   const promise = leaf.openFile(file, openState);
   return {leaf, promise};
-}
+}