Skip to content

Commit

Permalink
remove extra css, more test needed
Browse files Browse the repository at this point in the history
  • Loading branch information
elliottzheng committed May 2, 2019
2 parents a8c83fb + 9d3f787 commit 1f82932
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 49 deletions.
2 changes: 1 addition & 1 deletion dist_locales/zh-tw.json
Expand Up @@ -44,6 +44,6 @@
"resetDefault": "恢復預設設定",
"restoreDefault": "恢復預設設定",
"enableNotify": "啟用通知",
"smartTranslate": "Smart Translate",
"smartTranslate": "智慧型翻譯",
"titleBar": "titleBar"
}
6 changes: 5 additions & 1 deletion postbuild.js
@@ -1,6 +1,10 @@
const os = require("os");
if (os.platform() !== "win32") {
return;
}

const fs = require("fs");
const path = require("path");
const os = require("os");
const dist_dir = "./dist_electron";
const filePath = "./package.json";
const file = fs.readFileSync(filePath, "utf8");
Expand Down
17 changes: 0 additions & 17 deletions public/dialog.html

This file was deleted.

3 changes: 0 additions & 3 deletions public/milligram.min.css

This file was deleted.

3 changes: 3 additions & 0 deletions src/background.ts
Expand Up @@ -31,6 +31,9 @@ app.on("activate", () => {
}
});

// 禁用本地缓存
app.commandLine.appendSwitch("--disable-http-cache");

// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
Expand Down
7 changes: 6 additions & 1 deletion src/router.ts
Expand Up @@ -3,7 +3,7 @@ import Router from "vue-router";
import Focus from "./views/Focus.vue";
import Contrast from "./views/Contrast.vue";
import Settings from "./views/Settings.vue";

import Update from "./views/Update.vue";
Vue.use(Router);

export default new Router({
Expand All @@ -28,6 +28,11 @@ export default new Router({
path: "/settings",
name: "Settings",
component: Settings
},
{
path: "/update",
name: "Update",
component: Update
}
]
});
20 changes: 3 additions & 17 deletions src/tools/update.ts
Expand Up @@ -3,6 +3,7 @@ import { autoUpdater } from "electron-updater";
import { Controller } from "../core/controller";
import { envConfig } from "./envConfig";
import { checkUpdate } from "./checker";

let window: BrowserWindow | undefined = undefined;
let binded: boolean = false;
autoUpdater.autoDownload = false;
Expand Down Expand Up @@ -32,27 +33,12 @@ function bindUpdateEvents() {
parent: BrowserWindow.getAllWindows()[0],
icon: nativeImage.createFromPath(envConfig.iconPath)
});
window.loadURL(`${envConfig.publicUrl}/dialog.html`);
window.loadURL(envConfig.publicUrl + `/#/update`);
window.webContents.on("did-finish-load", function() {
(<BrowserWindow>window).webContents.executeJavaScript(
`document.getElementById("releaseNote").innerHTML="${
updateInfo.releaseNotes
}";document.getElementById("version").innerHTML="${
updateInfo.version
} ${updateInfo.releaseName}";`
);
(<BrowserWindow>window).webContents.send("releaseNote", updateInfo);
});
});

// autoUpdater.on("update-not-available", updateInfo => {
// dialog.showMessageBox({
// type: "info",
// title: "暂无更新",
// message: "当前版本已经是最新",
// icon: nativeImage.createFromPath(envConfig.iconPath)
// });
// });

autoUpdater.on("update-downloaded", () => {
dialog.showMessageBox(
{
Expand Down
63 changes: 63 additions & 0 deletions src/views/Update.vue
@@ -0,0 +1,63 @@
<!--
by: lizishan 2019-04-23
name: Update
notes:
-->
<template>
<div id="update">
<p v-html="releaseName" id="version"></p>
<p>更新日志:</p>
<div v-html="releaseNote" id="releaseNote"></div>
<el-button type="primary" @click="confirmUpdate()">下载更新</el-button>
</div>
</template>

<script>
import { ipcRenderer, shell } from "electron";
import os from "os";
export default {
name: "Update",
data() {
return {
releaseNote: null,
version: null,
releaseName: null,
updateTitle: null
};
},
methods: {
confirmUpdate() {
if (os.platform() === "win32") {
ipcRenderer.send("confirm-update");
} else {
shell.openExternal(
`https://github.com/CopyTranslator/CopyTranslator/releases/tag/v${
this.version
}`
);
}
}
},
created() {
ipcRenderer.on("releaseNote", (event, data) => {
this.releaseNote = data.releaseNotes;
this.version = data.version;
this.releaseName = data.releaseName;
});
}
};
</script>

<style scoped>
#version {
padding-top: 30px;
}
#releaseNote {
text-align: left;
font-size: 14px;
padding-left: 30px;
}
</style>
10 changes: 1 addition & 9 deletions vue.config.js
Expand Up @@ -31,14 +31,6 @@ module.exports = {
target: "nsis",
arch: ["x64"] //"ia32"
}
// {
// target: "portable",
// arch: ["x64"] //"ia32"
// },
// {
// target: "zip",
// arch: ["x64"] //"ia32"
// }
]
},
linux: {
Expand All @@ -53,7 +45,7 @@ module.exports = {
mac: {
target: [
{
target: "dmg",
target: "default",
arch: ["x64"]
}
],
Expand Down

0 comments on commit 1f82932

Please sign in to comment.