v1.5.0

p-sam · Jan 14, 2020 · f93b02d · f93b02d
2 parents a7921f7 + efb3cba
commit f93b02d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -52,10 +52,11 @@ prompt([options, parentBrowserWindow]).then(...).catch(...)
 | ------------- | ------------- |
 | title  | (optional, string) The title of the prompt window. Defaults to 'Prompt'. |
 | label  | (optional, string) The label which appears on the prompt for the input field. Defaults to 'Please input a value:'. |
+| buttonLabels | (optional, object) The text for the OK/cancel buttons. Properties are 'ok' and 'cancel'. Defaults to null. |
 | value  | (optional, string) The default value for the input field. Defaults to null.|
 | type   | (optional, string) The type of input field, either 'input' for a standard text input field or 'select' for a dropdown type input. Defaults to 'input'.|
 | inputAttrs  | (optional, object) The attributes of the input field, analagous to the HTML attributes: `{type: 'text', required: true}` -> `<input type="text" required>`. Used if the type is 'input' |
-| selectOptions  | (optional, object) The items for the select dropdown if using te 'select' type in the format 'value': 'display text', where the value is what will be given to the then block and the display text is what the user will see. |
+| selectOptions  | (optional, object) The items for the select dropdown if using the 'select' type in the format 'value': 'display text', where the value is what will be given to the then block and the display text is what the user will see. |
 | useHtmlLabel | (optional, boolean) Whether the label should be interpreted as HTML or not. Defaults to false. |
 | width  | (optional, integer) The width of the prompt window. Defaults to 370. |
 | minWidth  | (optional, integer) The minimum allowed width for the prompt window. Same default value as width. |

diff --git a/lib/index.js b/lib/index.js
@@ -21,6 +21,7 @@ function electronPrompt(options, parentWindow) {
 				resizable: false,
 				title: 'Prompt',
 				label: 'Please input a value:',
+				buttonLabels: null,
 				alwaysOnTop: false,
 				value: null,
 				type: 'input',

diff --git a/lib/page/prompt.css b/lib/page/prompt.css
@@ -51,7 +51,8 @@ select#data {
     padding: 0 .5em 0 0;
 }
 
-#buttons > button {
+#buttons > button,
+#buttons > input[type=submit] {
     border-radius: 2px;
     border: 0;
     margin: 0 0 0 .5em;

diff --git a/lib/page/prompt.html b/lib/page/prompt.html
@@ -4,14 +4,14 @@
     </head>
     <body>
         <div id="container">
-            <div id="form">
+            <form id="form">
                 <div id="label">...</div>
                 <div id="data-container"></div>
                 <div id="buttons">
                     <button id="cancel">Cancel</button>
-                    <button id="ok">OK</button>
+                    <button type="submit" id="ok">OK</button>
                 </div>
-            </div>
+            </form>
         </div>
         <script src="prompt.js"></script>
     </body>

diff --git a/lib/page/prompt.js b/lib/page/prompt.js
@@ -55,6 +55,14 @@ docReady(() => {
 		document.querySelector('#label').textContent = promptOptions.label;
 	}
 
+	if (promptOptions.buttonLabels && promptOptions.buttonLabels.ok) {
+		document.querySelector('#ok').textContent = promptOptions.buttonLabels.ok;
+	}
+
+	if (promptOptions.buttonLabels && promptOptions.buttonLabels.cancel) {
+		document.querySelector('#cancel').textContent = promptOptions.buttonLabels.cancel;
+	}
+
 	try {
 		if (promptOptions.customStylesheet) {
 			const customStyleContent = fs.readFileSync(promptOptions.customStylesheet);
@@ -69,8 +77,8 @@ docReady(() => {
 		return promptError(error);
 	}
 
-	document.querySelector('#ok').addEventListener('click', () => promptSubmit());
-	document.querySelector('#cancel').addEventListener('click', () => promptCancel());
+	document.querySelector('#form').addEventListener('submit', promptSubmit);
+	document.querySelector('#cancel').addEventListener('click', promptCancel);
 
 	const dataContainerEl = document.querySelector('#data-container');
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-prompt",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Electron helper to prompt for a value via input or select",
   "keywords": [
     "electron",