[fix] image path problem on Windows system

awmleer · Jul 8, 2017 · 19c8cc4 · 19c8cc4
1 parent 5880322
commit 19c8cc4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 /tasks/*/*.js
 /morph-darwin-x64/
 /morph-win32-x64/
+/build/
 
 # dependencies
 /node_modules

diff --git a/src/app/pages/presentation-page/presentation-page.component.ts b/src/app/pages/presentation-page/presentation-page.component.ts
@@ -98,7 +98,13 @@ export class PresentationPageComponent implements OnInit {
 
     parseFile(){
         let text = this.electronService.readFile(this.filePath);
-        let fileDir = this.filePath.replace(/(?:.(?!\/))+$/,'/');
+        let fileDir;
+        let isWindows=navigator.appVersion.indexOf('Win')!=-1;
+        if(isWindows){//for windows
+            fileDir = this.filePath.replace(/(?:.(?!\\))+$/,'\\');
+        }else{
+            fileDir = this.filePath.replace(/(?:.(?!\/))+$/,'/');
+        }
         let lines = text.split('\n');
         let inCodeBlock:boolean = false;
         let temp:string='';
@@ -116,7 +122,14 @@ export class PresentationPageComponent implements OnInit {
                 continue;
             }
             //fix image file paths
-            temp=temp.replace(/!\[(.*)\]\(\.\/(.+)\)/g,`![$1](${fileDir}$2)`);
+            if (temp.match(/!\[.*\]\(.+\)/)) {
+                if (isWindows) {
+                    temp=temp.replace(/\//g,'\\');
+                    temp=temp.replace(/!\[(.*)\]\(\.\\(.+)\)/g,`![$1](${fileDir}$2)`);
+                }else{
+                    temp=temp.replace(/!\[(.*)\]\(\.\/(.+)\)/g,`![$1](${fileDir}$2)`);
+                }
+            }
             //handle headings
             if (lines[k].match(/^ *##?#? /)) {
                 if (temp != '') {

diff --git a/src/electron/electron.ts b/src/electron/electron.ts
@@ -31,11 +31,11 @@ function initMainListener() {
 function createWindow() {
     applicationRef = new BrowserWindow(mainWindowSettings);
     applicationRef.loadURL(`file:///${__dirname}/../index.html`);
-    applicationRef.webContents.openDevTools();
-    if (debugMode) {
-        // Open the DevTools.
-        applicationRef.webContents.openDevTools();
-    }
+    // applicationRef.webContents.openDevTools();
+    // if (debugMode) {
+    //     // Open the DevTools.
+    //     applicationRef.webContents.openDevTools();
+    // }
     applicationRef.on('closed', () => {
         // Dereference the window object, usually you would store windows
         // in an array if your app supports multi windows, this is the time