From c2f869b3621ae8527fd2892df47017ab882d06fc Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 27 Jul 2016 14:39:22 -0700 Subject: [PATCH] Use dispatch('setTitle') and add dispatch('resetTitle') --- src/main/dialog.js | 2 +- src/renderer/controllers/playback-controller.js | 4 ++-- src/renderer/controllers/prefs-controller.js | 5 +++-- src/renderer/main.js | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/dialog.js b/src/main/dialog.js index e82a446e..c2cc1dcc 100644 --- a/src/main/dialog.js +++ b/src/main/dialog.js @@ -118,5 +118,5 @@ function setTitle (title) { } function resetTitle () { - setTitle(config.APP_WINDOW_TITLE) + window.main.dispatch('resetTitle') } diff --git a/src/renderer/controllers/playback-controller.js b/src/renderer/controllers/playback-controller.js index 8a84cefa..188483ce 100644 --- a/src/renderer/controllers/playback-controller.js +++ b/src/renderer/controllers/playback-controller.js @@ -242,7 +242,7 @@ module.exports = class PlaybackController { } // otherwise, play the video - state.window.title = torrentSummary.files[state.playing.fileIndex].name + dispatch('setTitle', torrentSummary.files[state.playing.fileIndex].name) this.update() ipcRenderer.send('onPlayerOpen') @@ -274,7 +274,7 @@ module.exports = class PlaybackController { else console.error('Unknown state.playing.result', state.playing.result) // Reset the window contents back to the home screen - state.window.title = this.config.APP_WINDOW_TITLE + dispatch('resetTitle') state.playing = State.getDefaultPlayState() state.server = null diff --git a/src/renderer/controllers/prefs-controller.js b/src/renderer/controllers/prefs-controller.js index 66bc0093..cdd0c297 100644 --- a/src/renderer/controllers/prefs-controller.js +++ b/src/renderer/controllers/prefs-controller.js @@ -1,3 +1,4 @@ +const {dispatch} = require('../lib/dispatcher') const State = require('../lib/state') // Controls the Preferences screen @@ -14,14 +15,14 @@ module.exports = class PrefsController { url: 'preferences', onbeforeload: function (cb) { // initialize preferences - state.window.title = 'Preferences' + dispatch('setTitle', 'Preferences') state.unsaved = Object.assign(state.unsaved || {}, {prefs: state.saved.prefs || {}}) cb() }, onbeforeunload: (cb) => { // save state after preferences this.save() - state.window.title = this.config.APP_WINDOW_TITLE + dispatch('resetTitle') cb() } }) diff --git a/src/renderer/main.js b/src/renderer/main.js index f79cb007..011b0240 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -219,6 +219,7 @@ const dispatchHandlers = { 'setDimensions': setDimensions, 'toggleFullScreen': (setTo) => ipcRenderer.send('toggleFullScreen', setTo), 'setTitle': (title) => { state.window.title = title }, + 'resetTitle': () => { state.window.title = config.APP_WINDOW_TITLE }, // Everything else 'onOpen': onOpen,