From df6457a4e4e01ac88b0314cb859a7434bf1f18a3 Mon Sep 17 00:00:00 2001 From: odango_san Date: Sat, 10 Dec 2016 01:58:42 +0900 Subject: [PATCH] add clear localstorage method --- src/electron/ts/Main.prod.ts | 2 +- src/electron/ts/Main.ts | 2 +- src/renderer/css/main.less | 8 ++++++-- src/renderer/html/index.html | 3 +-- src/renderer/ts/Application.ts | 29 +++++++++++++++++++++-------- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/electron/ts/Main.prod.ts b/src/electron/ts/Main.prod.ts index 11eef7d..e38f751 100644 --- a/src/electron/ts/Main.prod.ts +++ b/src/electron/ts/Main.prod.ts @@ -27,7 +27,7 @@ class Main { // Create the browser window. this.mainWindow = new BrowserWindow({ width: 800, height: 600, - icon: __dirname + '/assets/icon/favicon.png', + icon: __dirname + '/assets/icon/favicon.png' }); // disable menubar. this.mainWindow.setMenu(null); diff --git a/src/electron/ts/Main.ts b/src/electron/ts/Main.ts index 6896c4b..609264b 100644 --- a/src/electron/ts/Main.ts +++ b/src/electron/ts/Main.ts @@ -26,7 +26,7 @@ class Main { // Create the browser window. this.mainWindow = new BrowserWindow({ width: 800, height: 600, - icon: __dirname + '/assets/icon/favicon.png', + icon: __dirname + '/assets/icon/favicon.png' }); // disable menubar. this.mainWindow.setMenu(null); diff --git a/src/renderer/css/main.less b/src/renderer/css/main.less index a8bfc27..7c864d1 100644 --- a/src/renderer/css/main.less +++ b/src/renderer/css/main.less @@ -4,12 +4,12 @@ visibility: hidden; } -.mdl-layout__content{ +.mdl-layout__content { padding-left: 10px; } #loading { - &.aa { + &.aa { font-family: "MS Pゴシック", "MS PGothic", "Mona", "mona-gothic-jisx0208.1990-0", sans-serif; overflow: auto; line-height: 1.125em; @@ -20,6 +20,10 @@ } } +.cursor--hand { + cursor: pointer; +} + /* body { diff --git a/src/renderer/html/index.html b/src/renderer/html/index.html index e0836a4..648cd2b 100644 --- a/src/renderer/html/index.html +++ b/src/renderer/html/index.html @@ -96,9 +96,8 @@ - - + diff --git a/src/renderer/ts/Application.ts b/src/renderer/ts/Application.ts index b56cb75..5129228 100644 --- a/src/renderer/ts/Application.ts +++ b/src/renderer/ts/Application.ts @@ -27,7 +27,7 @@ export default class Application extends Vue { Logger.log("start", "hello application."); this.pManager = new ProvideManager(); this.setTitle(""); - this.thread = new Shitaraba("dummy"); + this.thread = new Shitaraba("dummyThread"); this.loadSettings(); } @@ -161,8 +161,8 @@ export default class Application extends Vue { return true; } - usePath():boolean{ - return this.pManager.voice === VOICE.SOFTALK || this.pManager.voice === VOICE.TAMIYASU; + usePath(): boolean { + return this.pManager.voice === VOICE.SOFTALK || this.pManager.voice === VOICE.TAMIYASU; } // refresh requestOnce() { @@ -203,10 +203,13 @@ export default class Application extends Vue { // 表示するものがない時 dummyText: string = ""; + provideDummyText() { this.pManager.dummyText(this.dummyText); } + dummyTextTemp: string = ""; + insertDummyText() { this.dummyText = this.dummyTextTemp; if (!this.processing) @@ -246,11 +249,10 @@ export default class Application extends Vue { } test(letter: string, body: string) { - this.pManager.provide(letter, body, this.pManager.reading,null,this.provideTimeLimit); + this.pManager.provide(letter, body, this.pManager.reading, null, this.provideTimeLimit); } - autoScroll: boolean = false; - cnangeAutoScroll() { + autoScroll: boolean = false; cnangeAutoScroll() { this.autoScroll = !this.autoScroll; } scrollTo(value: number, duration?: number) { @@ -270,7 +272,6 @@ export default class Application extends Vue { Logger.log("pManager.reading", this.pManager.reading) } - // softalk or webspeechapi path: string = ""; @Watch("pManager.voice") onVoiceChange(newValue: number, oldValue: number) { @@ -340,10 +341,12 @@ export default class Application extends Vue { this.loadSettings(); } } + mounted() { if (this.thread.bookmark != 0) this.scrollTo(this.thread.bookmark); }; + saveSettings() { localStorage.setItem(SETTINGS, JSON.stringify({ url: this.url, @@ -360,13 +363,14 @@ export default class Application extends Vue { dummyText: this.dummyText })); }; + @Watch("settings") onSettingsChange(newValue: number, oldValue: number) { this.saveSettings() var settings = JSON.parse(localStorage.getItem(SETTINGS)); } - version = VERSION; + version = VERSION; isValidURL(): boolean { if (!this.url) { @@ -391,4 +395,13 @@ export default class Application extends Vue { } } } + + clearDataSource() { + for (var a in localStorage) { + if (a.startsWith("http")) + DataSource.clearDataSource(a); + } + this.snackbar({ message: "キャッシュを消去しました" }); + this.thread = new Shitaraba("dummyThread"); + } }