mirror of
https://gitlab.com/ryzen-controller-team/ryzen-controller.git
synced 2024-12-22 10:03:28 +07:00
Adding syntax js tests.
This commit is contained in:
parent
5482f9f586
commit
557d2fb222
@ -4,6 +4,16 @@ stages:
|
||||
- installer
|
||||
- check
|
||||
|
||||
js_syntax:
|
||||
retry: 1
|
||||
stage: check
|
||||
image: node:carbon
|
||||
tags: [ docker ]
|
||||
before_script:
|
||||
- npm install -g acorn
|
||||
script:
|
||||
- find . -iname "*.js" -print0 | xargs -0 -I % sh -c 'echo "%"; acorn --ecma6 --silent "%"'
|
||||
|
||||
dependency_scanning:
|
||||
stage: check
|
||||
only:
|
||||
|
13
js/app.js
13
js/app.js
@ -18,10 +18,15 @@ ready(function(){
|
||||
updatePresetList();
|
||||
checkForNewRelease();
|
||||
document.isStarting = false;
|
||||
settings.set('settings', {
|
||||
...settings.get('settings'),
|
||||
first_launch: false
|
||||
});
|
||||
|
||||
|
||||
settings.set('settings',
|
||||
Object.assign(
|
||||
{},
|
||||
settings.get('settings'),
|
||||
{ first_launch: false }
|
||||
)
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
|
@ -149,10 +149,15 @@ function askingForRyzenAdjExecutablePath() {
|
||||
}, function (filePaths) {
|
||||
if (typeof filePaths[0] !== 'undefined') {
|
||||
const settings = require('electron-settings');
|
||||
settings.set("settings", {
|
||||
...settings.get('settings'),
|
||||
ryzen_adj_path: filePaths[0]
|
||||
});
|
||||
|
||||
settings.set("settings",
|
||||
Object.assign(
|
||||
{},
|
||||
settings.get('settings'),
|
||||
{ ryzen_adj_path: filePaths[0] }
|
||||
)
|
||||
);
|
||||
|
||||
notification('primary', 'Path to ryzenAdj.exe has been saved.');
|
||||
appendLog(`askingForRyzenAdjExecutablePath(): ${filePaths[0]}`);
|
||||
} else {
|
||||
@ -249,39 +254,69 @@ function registerEventListenerForSettingsInput() {
|
||||
|
||||
var apply_last_settings_on_launch = document.getElementById('apply_last_settings_on_launch');
|
||||
apply_last_settings_on_launch.addEventListener('change', function() {
|
||||
settings.set('settings', {
|
||||
...settings.get('settings'),
|
||||
apply_last_settings_on_launch: !!apply_last_settings_on_launch.checked
|
||||
});
|
||||
|
||||
settings.set(
|
||||
"settings",
|
||||
Object.assign(
|
||||
{},
|
||||
settings.get('settings'),
|
||||
{ apply_last_settings_on_launch: !!apply_last_settings_on_launch.checked }
|
||||
)
|
||||
);
|
||||
|
||||
});
|
||||
var minimize_to_tray = document.getElementById('minimize_to_tray');
|
||||
minimize_to_tray.addEventListener('change', function() {
|
||||
settings.set('settings', {
|
||||
...settings.get('settings'),
|
||||
minimize_to_tray: !!minimize_to_tray.checked
|
||||
});
|
||||
|
||||
settings.set(
|
||||
"settings",
|
||||
Object.assign(
|
||||
{},
|
||||
settings.get('settings'),
|
||||
{ minimize_to_tray: !!minimize_to_tray.checked }
|
||||
)
|
||||
);
|
||||
|
||||
});
|
||||
var start_minimized = document.getElementById('start_minimized');
|
||||
start_minimized.addEventListener('change', function() {
|
||||
settings.set('settings', {
|
||||
...settings.get('settings'),
|
||||
start_minimized: !!start_minimized.checked
|
||||
});
|
||||
|
||||
settings.set(
|
||||
"settings",
|
||||
Object.assign(
|
||||
{},
|
||||
settings.get('settings'),
|
||||
{ start_minimized: !!start_minimized.checked }
|
||||
)
|
||||
);
|
||||
|
||||
});
|
||||
var reapply_periodically = document.getElementById('reapply_periodically');
|
||||
reapply_periodically.addEventListener('change', function() {
|
||||
reApplyPeriodically(reapply_periodically.value);
|
||||
settings.set('settings', {
|
||||
...settings.get('settings'),
|
||||
reapply_periodically: reapply_periodically.value
|
||||
});
|
||||
|
||||
settings.set(
|
||||
"settings",
|
||||
Object.assign(
|
||||
{},
|
||||
settings.get('settings'),
|
||||
{ reapply_periodically: reapply_periodically.value }
|
||||
)
|
||||
);
|
||||
|
||||
});
|
||||
// var start_at_boot = document.getElementById('start_at_boot');
|
||||
// start_at_boot.addEventListener('change', function() {
|
||||
// settings.set('settings', {
|
||||
// ...settings.get('settings'),
|
||||
// start_at_boot: !!start_at_boot.checked
|
||||
// });
|
||||
//
|
||||
// settings.set(
|
||||
// "settings",
|
||||
// Object.assign(
|
||||
// {},
|
||||
// settings.get('settings'),
|
||||
// { start_at_boot: !!start_at_boot.checked }
|
||||
// )
|
||||
// );
|
||||
//
|
||||
// require('electron').remote.app.setLoginItemSettings({ openAtLogin: !!start_at_boot.checked });
|
||||
// });
|
||||
}
|
||||
@ -422,10 +457,12 @@ function saveToNewPreset() {
|
||||
notification('warning', `This preset name already exist, your preset has been saved with the name "${newPresetName}".`);
|
||||
}
|
||||
|
||||
const newPresetList = {
|
||||
...currentPresets,
|
||||
[newPresetName]: settingsToBeSaved,
|
||||
};
|
||||
const newPresetList = Object.assign(
|
||||
{},
|
||||
currentPresets,
|
||||
{ [newPresetName]: settingsToBeSaved }
|
||||
);
|
||||
|
||||
require('electron-settings').set('presets', newPresetList);
|
||||
appendLog(`saveToNewPreset(): Saved preset ${newPresetName}, ${JSON.stringify(newPresetList)}`);
|
||||
updatePresetList();
|
||||
|
18
main.js
18
main.js
@ -1,9 +1,8 @@
|
||||
// Handle setupevents as quickly as possible
|
||||
const setupEvents = require('./installers/setupEvents')
|
||||
if (setupEvents.handleSquirrelEvent()) {
|
||||
|
||||
// squirrel event handled and app will exit in 1000ms, so don't do anything else
|
||||
return;
|
||||
}
|
||||
if (!setupEvents.handleSquirrelEvent()) {
|
||||
|
||||
// Modules to control application life and create native browser window
|
||||
const {app, BrowserWindow, Menu, Tray} = require('electron')
|
||||
@ -111,11 +110,17 @@ if (old_version !== new_version) {
|
||||
settings.set('latest_controller_tabs_settings', update_preset_to_1_12_0(settings.get('latest_controller_tabs_settings')));
|
||||
}
|
||||
|
||||
settings.set('settings', {
|
||||
...settings.set('settings'),
|
||||
settings.set('settings',
|
||||
Object.assign(
|
||||
{},
|
||||
settings.set('settings'),
|
||||
{
|
||||
last_used_version: require('./package.json').version,
|
||||
first_launch: true,
|
||||
});
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
// Keep a global reference of the window object, if you don't, the window will
|
||||
@ -216,3 +221,4 @@ app.on('activate', function () {
|
||||
|
||||
// In this file you can include the rest of your app's specific main process
|
||||
// code. You can also put them in separate files and require them here.
|
||||
}
|
||||
|
14
package-lock.json
generated
14
package-lock.json
generated
@ -249,7 +249,8 @@
|
||||
"ansi-regex": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
|
||||
"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
|
||||
"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
|
||||
"optional": true
|
||||
},
|
||||
"is-fullwidth-code-point": {
|
||||
"version": "2.0.0",
|
||||
@ -272,6 +273,7 @@
|
||||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
|
||||
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"ansi-regex": "^4.1.0"
|
||||
}
|
||||
@ -864,7 +866,8 @@
|
||||
"emoji-regex": {
|
||||
"version": "7.0.3",
|
||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
|
||||
"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
|
||||
"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
|
||||
"optional": true
|
||||
},
|
||||
"end-of-stream": {
|
||||
"version": "1.4.1",
|
||||
@ -1343,7 +1346,8 @@
|
||||
"is-promise": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
|
||||
"integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU="
|
||||
"integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=",
|
||||
"optional": true
|
||||
},
|
||||
"is-stream": {
|
||||
"version": "1.1.0",
|
||||
@ -2570,7 +2574,8 @@
|
||||
"ansi-regex": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
|
||||
"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
|
||||
"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
|
||||
"optional": true
|
||||
},
|
||||
"is-fullwidth-code-point": {
|
||||
"version": "2.0.0",
|
||||
@ -2593,6 +2598,7 @@
|
||||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
|
||||
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"ansi-regex": "^4.1.0"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user