electron-builder, markdown etc

Switched to electron-builder
Uses latest electron
MarkDown now works with images
Reorganised Markdown CSS to document.css
Minor Bug Fixes

Author: manngo

README/styles.css README.css

@@ -8,7 +8,7 @@
 		tab-size: 4 !important;
 	}
 </style>
-#	Document Pager 0.2.7
+#	Document Pager 0.3
 
 Document Pager © Mark Simon  
 https://github.com/manngo/document-pager

README.md

@@ -1,4 +1,4 @@
-##	About Text Pager 0.2.7
+##	About Text Pager 0.3
 
 Text Pager © Mark Simon
 See also https://pager.internotes.net/

data/about.md

@@ -1,18 +1,17 @@
 {
 	"name": "document-pager",
-	"version": "0.2.7",
+	"version": "0.3.0",
 	"description": "Document Pager: Displays a text document in tabbed pages.",
 	"main": "main.js",
 	"repository": "https://github.com/manngo/document-pager",
 	"keywords": [],
 	"author": "Mark Simon",
 	"license": "CC0-1.0",
 	"devDependencies": {
-		"electron-packager": "^15.2.0"
+
 	},
 	"dependencies": {
 		"clipboard": "^2.0.4",
-		"electron": "^5.0.13",
 		"electron-log": "^4.0.2",
 		"electron-reload": "^1.5.0",
 		"ini": ">=1.3.6",
@@ -24,6 +23,31 @@
 		"yargs-parser": ">=13.1.2"
 	},
 	"productName": "Document Pager",
+	"build": {
+		"appId": "com.webcraft101.document-pager",
+		"mac": {
+			"category": "public.app-category.developer-tools",
+			"target": [
+				"zip", "dmg"
+			],
+			"icon": "images/edit-virtual-hosts.icns"
+		},
+		"win": {
+			"target": [
+				"zip", "nsis", "portable"
+			],
+			"icon": "images/edit-virtual-hosts.ico"
+		},
+		"nsis": {
+			"oneClick": false,
+			"perMachine": false,
+			"allowElevation": true,
+			"allowToChangeInstallationDirectory": true
+		},
+		"directories": {
+			"output": "../electron-builder/${name}/${os}"
+		}
+	},
 	"scripts": {
 		"start": "electron .",
 		"pack": "electron-builder --dir",

package.json

@@ -248,15 +248,15 @@
 			smallerButton.onclick=function(event) {
 				fontSize/=1.25;
 				divContentPre.style.setProperty('--font-size',fontSize+'em');
-			}
+			};
 			defaultButton.onclick=function(event) {
 				fontSize=codeFontSize;
 				divContentPre.style.setProperty('--font-size','');
-			}
+			};
 			largerButton.onclick=function(event) {
 				fontSize*=1.25;
 				divContentPre.style.setProperty('--font-size',fontSize+'em');
-			}
+			};
 
 		//	Additional Prism Langage Aliases
 
@@ -331,11 +331,11 @@
 						var p=this.previous;
 						if(p) {
 							previousButton.onclick=function(event) { p.click(); };
-						};
+						}
 						var n=this.next;
 						if(n) {
 							nextButton.onclick=function(event) { n.click(); };
-						};
+						}
 
 						var doHighlight=formControl.elements['show-highlight'].checked?!event.altKey:event.altKey;
 						currentItem=data.li=this;
@@ -355,7 +355,7 @@
 						if(language && doHighlight) codeElement.innerHTML=Prism.highlight(item, Prism.languages[data.language], data.language);
 						else if(data.language=='md' && doHighlight) {
 							codeElement.innerHTML=marked(item);
-							codeElement.classList.add('markdown')
+							codeElement.classList.add('markdown');
 						}
 						document.title=documentTitle+': '+data.fileName+' — '+title;
 						h1.innerHTML=documentTitle+': '+data.fileName+' — '+title;

scripts/do-pager.js

@@ -57,6 +57,9 @@
 	const os=require('os');
 
 /**	Extensions
+	================================================
+	`${data.path}/${data.fileName}`
+	image(string href, string title, string text)
 	================================================ */
 
 	var renderer = new marked.Renderer();
@@ -71,7 +74,6 @@
 			return `<h${level}${id}${className}>${content}</h${level}>`;
 		}
 		else return marked(text);
-
 	};
 
 	const window=remote.getCurrentWindow();
@@ -633,7 +635,19 @@
 			if(language && doHighlight) elements.codeElement.innerHTML=Prism.highlight(item, Prism.languages[data.language], data.language);
 			else if(data.language=='markdown' && doHighlight) {
 				var div=document.createElement('div');
+
 				var innerHTML=marked(item,{baseUrl: `${data.path}/${data.fileName}`, renderer});
+
+				// innerHTML=innerHTML.replace(/<img(.*?)src="(.*)"(.*?)>/g,function(match,p1,p2,p3,offset,string) {
+				// 	if (p2.match(/^https?:\/\//)) return string;
+				// 	else return `<img${p1}src="${currentTab.data.path}/${currentTab.data.fileName.replace(/\.[^.]*$/,'')}/${p2.replace(/^\//,'')}"${p3}>`;
+				// });
+
+				innerHTML=innerHTML.replace(/<img(.*?)src="(.*)"(.*?)>/g,function(match,p1,p2,p3,offset,string) {
+					if (p2.match(/^https?:\/\//)) return string;
+					else return `<img${p1}src="${currentTab.data.path}/${p2.replace(/^\//,'')}"${p3}>`;
+				});
+
 				div.innerHTML=innerHTML;
 				var h2=div.querySelector('h1,h2');
 				div.id=h2.id;
@@ -695,7 +709,9 @@
 		path=path.join('/');
 		extension=fileName.split('.').pop();
 		css='';
-		if(extensions[extension]=='markdown') css=`${path}/${fileName.replace(/\..*$/,'')}/styles.css`;
+		// if(extensions[extension]=='markdown') css=`${path}/${fileName.replace(/\..*$/,'')}/styles.css`;
+		//	if(extensions[extension]=='markdown') css=`${path}/styles.css`;
+		if(extensions[extension]=='markdown') css=`${path}/${fileName.replace(/\..*$/,'')}.css`;
 
 		return {path,fileName,extension,css};
 	}

scripts/pager.js

@@ -1,5 +1,5 @@
 {
-	"version": "0.2.7",
+	"version": "0.3.0",
 	"headings": {
 		"title": "Document Pager",
 		"h1": "Document Pager",