@dimensional-innovations/electron-background 2.0.8 → 2.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/BrowserWindow.js +5 -1
- package/package.json +4 -2
package/dist/BrowserWindow.js
CHANGED
|
@@ -31,9 +31,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
31
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
34
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
38
|
exports.FullScreenBrowserWindow = exports.KioskBrowserWindow = exports.DefaultBrowserWindow = void 0;
|
|
36
39
|
const electron_1 = require("electron");
|
|
40
|
+
const lodash_merge_1 = __importDefault(require("lodash.merge"));
|
|
37
41
|
/**
|
|
38
42
|
* Applies default options to the browser window. If `appHeight`, `appWidth`, or `backgroundColor` are included in
|
|
39
43
|
* app config, they will be added to the window options as well.
|
|
@@ -49,7 +53,7 @@ class DefaultBrowserWindow {
|
|
|
49
53
|
}
|
|
50
54
|
afterReady(context) {
|
|
51
55
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
|
-
context.browserWindowOptions =
|
|
56
|
+
context.browserWindowOptions = (0, lodash_merge_1.default)({}, this.getDefaultWindowOptions(), this.getWindowOptionsFromConfig(context.config), context.browserWindowOptions, this.options, { closable: true });
|
|
53
57
|
});
|
|
54
58
|
}
|
|
55
59
|
getDefaultWindowOptions() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dimensional-innovations/electron-background",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.9",
|
|
4
4
|
"description": "the background script for electron apps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -33,9 +33,11 @@
|
|
|
33
33
|
"axios": "^1.6.7",
|
|
34
34
|
"electron-devtools-installer": "^4.0.0",
|
|
35
35
|
"electron-log": "^5.1.1",
|
|
36
|
-
"electron-updater": "^6.1.7"
|
|
36
|
+
"electron-updater": "^6.1.7",
|
|
37
|
+
"lodash.merge": "^4.6.2"
|
|
37
38
|
},
|
|
38
39
|
"devDependencies": {
|
|
40
|
+
"@types/lodash.merge": "^4.6.9",
|
|
39
41
|
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
|
40
42
|
"@typescript-eslint/parser": "^6.21.0",
|
|
41
43
|
"electron": "^28.2.1",
|