Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion js/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const defaults = {
address: address,
port: port,
basePath: "/",
kioskmode: false,
electronOptions: {},
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],

Expand Down
2 changes: 1 addition & 1 deletion js/deprecated.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
configs: ["kioskmode"],
configs: [],
clock: ["secondsColor"]
};
34 changes: 5 additions & 29 deletions js/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,11 @@ function createWindow () {
backgroundColor: "#000000"
};

/*
* DEPRECATED: "kioskmode" backwards compatibility, to be removed
* settings these options directly instead provides cleaner interface
*/
if (config.kioskmode) {
electronOptionsDefaults.kiosk = true;
} else {
electronOptionsDefaults.show = false;
electronOptionsDefaults.frame = false;
electronOptionsDefaults.transparent = true;
electronOptionsDefaults.hasShadow = false;
electronOptionsDefaults.fullscreen = true;
}
electronOptionsDefaults.show = false;
electronOptionsDefaults.frame = false;
electronOptionsDefaults.transparent = true;
electronOptionsDefaults.hasShadow = false;
electronOptionsDefaults.fullscreen = true;

const electronOptions = Object.assign({}, electronOptionsDefaults, config.electronOptions);

Expand Down Expand Up @@ -132,22 +124,6 @@ function createWindow () {
mainWindow = null;
});

if (config.kioskmode) {
mainWindow.on("blur", function () {
mainWindow.focus();
});

mainWindow.on("leave-full-screen", function () {
mainWindow.setFullScreen(true);
});

mainWindow.on("resize", function () {
setTimeout(function () {
mainWindow.reload();
}, 1000);
});
}

//remove response headers that prevent sites of being embedded into iframes if configured
mainWindow.webContents.session.webRequest.onHeadersReceived((details, callback) => {
let curHeaders = details.responseHeaders;
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/classes/deprecated_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ describe("Deprecated", () => {
expect(typeof deprecated).toBe("object");
});

it("should contain configs array with deprecated options as strings", () => {
expect(Array.isArray(["deprecated.configs"])).toBe(true);
it("should contain clock array with deprecated options as strings", () => {
expect(Array.isArray(["deprecated.clock"])).toBe(true);
for (let option of deprecated.configs) {
expect(typeof option).toBe("string");
}
expect(deprecated.configs).toEqual(expect.arrayContaining(["kioskmode"]));
expect(deprecated.clock).toEqual(expect.arrayContaining(["secondsColor"]));
});
});