From e5d83ed2f2ce36d649cdcc75851ca70ab0047d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= Date: Fri, 8 Sep 2017 13:43:02 +0200 Subject: [PATCH] =?UTF-8?q?transloadit,webcam:=20Rename=20`updateState`=20?= =?UTF-8?q?=E2=86=92=20`setPluginState`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/Transloadit/index.js | 16 ++++++++-------- src/plugins/Webcam/index.js | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/plugins/Transloadit/index.js b/src/plugins/Transloadit/index.js index d7eab0291..86a5142ee 100644 --- a/src/plugins/Transloadit/index.js +++ b/src/plugins/Transloadit/index.js @@ -130,7 +130,7 @@ module.exports = class Transloadit extends Plugin { [uploadID]: assemblyList.concat([ assembly.assembly_id ]) }) - this.updateState({ + this.setPluginState({ assemblies: Object.assign(state.assemblies, { [assembly.assembly_id]: assembly }), @@ -236,7 +236,7 @@ module.exports = class Transloadit extends Plugin { onFileUploadComplete (assemblyId, uploadedFile) { const state = this.core.state.transloadit const file = this.findFile(uploadedFile) - this.updateState({ + this.setPluginState({ files: Object.assign({}, state.files, { [uploadedFile.id]: { id: file.id, @@ -253,7 +253,7 @@ module.exports = class Transloadit extends Plugin { // The `file` may not exist if an import robot was used instead of a file upload. result.localId = file ? file.id : null - this.updateState({ + this.setPluginState({ results: state.results.concat(result) }) this.core.emit('transloadit:result', stepName, result, this.getAssembly(assemblyId)) @@ -262,7 +262,7 @@ module.exports = class Transloadit extends Plugin { onAssemblyFinished (url) { this.client.getAssemblyStatus(url).then((assembly) => { const state = this.core.state.transloadit - this.updateState({ + this.setPluginState({ assemblies: Object.assign({}, state.assemblies, { [assembly.assembly_id]: assembly }) @@ -330,7 +330,7 @@ module.exports = class Transloadit extends Plugin { const uploadsAssemblies = Object.assign({}, state.uploadsAssemblies, { [uploadID]: [] }) - this.updateState({ uploadsAssemblies }) + this.setPluginState({ uploadsAssemblies }) let optionsPromise if (fileIDs.length > 0) { @@ -458,7 +458,7 @@ module.exports = class Transloadit extends Plugin { const state = this.core.state.transloadit const uploadsAssemblies = Object.assign({}, state.uploadsAssemblies) delete uploadsAssemblies[uploadID] - this.updateState({ uploadsAssemblies }) + this.setPluginState({ uploadsAssemblies }) }) } @@ -470,7 +470,7 @@ module.exports = class Transloadit extends Plugin { this.core.on('core:upload-success', this.onFileUploadURLAvailable) } - this.updateState({ + this.setPluginState({ // Contains assembly status objects, indexed by their ID. assemblies: {}, // Contains arrays of assembly IDs, indexed by the upload ID that they belong to. @@ -505,7 +505,7 @@ module.exports = class Transloadit extends Plugin { }) } - updateState (newState) { + setPluginState (newState) { const transloadit = Object.assign({}, this.core.state.transloadit, newState) this.core.setState({ transloadit }) diff --git a/src/plugins/Webcam/index.js b/src/plugins/Webcam/index.js index 280dc4f39..d27aa00af 100644 --- a/src/plugins/Webcam/index.js +++ b/src/plugins/Webcam/index.js @@ -72,7 +72,7 @@ module.exports = class Webcam extends Plugin { this.i18n = this.translator.translate.bind(this.translator) this.install = this.install.bind(this) - this.updateState = this.updateState.bind(this) + this.setPluginState = this.setPluginState.bind(this) this.render = this.render.bind(this) @@ -104,7 +104,7 @@ module.exports = class Webcam extends Plugin { /** * Little shorthand to update the state with my new state */ - updateState (newState) { + setPluginState (newState) { const {state} = this.core const webcam = Object.assign({}, state.webcam, newState) @@ -117,13 +117,13 @@ module.exports = class Webcam extends Plugin { this.webcam.start() .then((stream) => { this.stream = stream - this.updateState({ + this.setPluginState({ // videoStream: stream, cameraReady: true }) }) .catch((err) => { - this.updateState({ + this.setPluginState({ cameraError: err }) }) @@ -141,7 +141,7 @@ module.exports = class Webcam extends Plugin { }) this.recorder.start() - this.updateState({ + this.setPluginState({ isRecording: true }) } @@ -149,7 +149,7 @@ module.exports = class Webcam extends Plugin { stopRecording () { return new Promise((resolve, reject) => { this.recorder.addEventListener('stop', () => { - this.updateState({ + this.setPluginState({ isRecording: false })