diff --git a/.gitattributes b/.gitattributes index e1106bed..ab18c0c8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,6 +10,7 @@ *.bat text eol=crlf *.cmd text eol=crlf *.coffee text +*.cjs text eol=lf *.css text *.htm text diff=html *.html text diff=html @@ -21,6 +22,7 @@ *.less text *.ls text *.map text -diff +*.mjs text eol=lf *.od text *.onlydata text *.php text diff=php diff --git a/js/app-config.cjs b/js/app-config.cjs index 9bd04707..7a99c05f 100644 --- a/js/app-config.cjs +++ b/js/app-config.cjs @@ -1,8 +1,8 @@ 'use strict'; const { app } = require('electron'); -const path = require('path'); const os = require('os'); +const path = require('path'); const macOS = process.platform === 'darwin'; const win32 = process.platform === 'win32'; diff --git a/js/window-aux.cjs b/js/window-aux.cjs index 2e559578..e139b27a 100644 --- a/js/window-aux.cjs +++ b/js/window-aux.cjs @@ -5,7 +5,7 @@ const BrowserWindow = (electron || require('@electron/remote')).BrowserWindow; const dialog = (electron || require('@electron/remote')).dialog; /** - * Opens an electron dialog, based on the options, and returns the promise. + * Opens an electron dialog based on the options, and returns a promise that resolves with the response. * @param {Object.} options * @return {Promise} */