Skip to content
This repository was archived by the owner on Jul 30, 2020. It is now read-only.

Commit 0c300f4

Browse files
committed
bugfixes and typos from code, package formatting changed
1 parent 0e10b26 commit 0c300f4

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

DECSV_project/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ if (!gotTheLock) {
170170

171171
// saving command line parameter (file to be opened...)
172172
if (process.platform == 'win32' && process.argv.length >= 2) {
173-
pre_project = process.argv[1];
173+
if (process.argv[1] !== "--updated") { pre_project = process.argv[1]; }// since this is put here after updating
174174
logger.info("[FIRST INSTANCE] Settings main process pre_project variable(win32): " + pre_project);
175175
} else {
176176
logger.warn("[FIRST INSTANCE] Platform is not win32, or argv.length is not >=2!");

DECSV_project/assets/js/openwin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,17 @@ ipcRenderer.on('check-updates-reply', (event, arg) => {
117117
var download_data = i18n.__("open-update-downloading") + (Math.round((progressObj.transferred / 1000000) * 100) / 100) + "MB/" + (Math.round((progressObj.total / 1000000) * 100) / 100) + "MB @ " + (Math.round((progressObj.bytesPerSecond / 1000) * 100) / 100) + " kBps";
118118
var download_percent = progressObj.percent;
119119

120-
if (arg[1] = 100) {
120+
if (download_percent == 100) {
121121
//completed download
122-
$("#open-update-text").text('open-update-finish');
122+
$("#open-update-text").text(i18n.__('open-update-finish'));
123123
} else {
124124
$("#open-update-text").text(download_data);
125125
}
126126
}
127127
else if (arg[0] === 5) {
128128
// mark download progress as 100%
129129
//var download_percent = 100;
130-
$("#open-update-text").text('open-update-restarting');
130+
$("#open-update-text").text(i18n.__('open-update-restarting'));
131131
var ver = arg[1];
132132
var relDat = arg[2];
133133
var relNote = arg[3];

DECSV_project/package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"name": "teacher_tool",
3-
"productName": "SLIPPS Teacher Tool",
4-
"copyright": "Copyright (c) 2019 ${author}",
2+
"name": "slipps_teacher_tool",
53
"version": "4.0.1-beta",
64
"description": "SLIPPS survey results review and edit application.",
75
"main": "app.js",
@@ -17,35 +15,37 @@
1715
"rebuild-iconv": "electron-rebuild -f -w iconv"
1816
},
1917
"build": {
20-
"publish": [
21-
{
22-
"provider": "github",
23-
"owner": "Tyaisurm",
24-
"repo": "DECSV",
25-
"releaseType": "draft"
26-
}
27-
],
28-
"appId": "lut.electron.slipps.teacher_tool",
29-
"win": {
30-
"target": "nsis",
31-
"icon": "./build/icon.ico"
32-
},
33-
"mac": {
34-
"category": "editor",
35-
"target": "default",
36-
"icon": "./build/icon.png"
37-
},
18+
"copyright": "Copyright (c) 2019 Jaakko Tuuri",
19+
"productName": "SLIPPS Teacher Tool",
20+
"appId": "lut.electron.slipps_teacher_tool",
3821
"nsis": {
39-
"artifactName": "${productName} Setup ${os}-${arch}-${version}.${ext}"
22+
"artifactName": "SLIPPS.Teacher.Tool.Setup.${os}-${arch}-${version}.${ext}"
4023
},
4124
"dmg": {
42-
"title": "${productName} Setup ${os}-${arch}-${version}"
25+
"title": "SLIPPS.Teacher.Tool.Setup.${os}-${arch}-${version}"
4326
},
4427
"squirrelWindows": {
4528
"iconUrl": "https://github.com/Tyaisurm/DECSV/blob/master/DECSV_project/build/icon.ico?raw=true",
4629
"remoteReleases": "https://github.com/Tyaisurm/DECSV",
4730
"loadingGif": "./build/install-spinner.gif"
4831
},
32+
"win": {
33+
"target": "nsis",
34+
"icon": "./build/icon.ico"
35+
},
36+
"mac": {
37+
"category": "editor",
38+
"target": "default",
39+
"icon": "./build/icon.png"
40+
},
41+
"publish": [
42+
{
43+
"provider": "github",
44+
"owner": "Tyaisurm",
45+
"repo": "DECSV",
46+
"releaseType": "draft"
47+
}
48+
],
4949
"fileAssociations": {
5050
"ext": "decsv",
5151
"name": "DECSV",
@@ -57,7 +57,7 @@
5757
"repository": "https://github.com/Tyaisurm/DECSV",
5858
"keywords": [
5959
"Electron",
60-
"DECSV",
60+
"decsv",
6161
"SLIPPS",
6262
"Teacher Tool"
6363
],

0 commit comments

Comments
 (0)