From 588431b988b138047aa4d7343c23d22d99285631 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 7 Jun 2018 17:58:42 +0200 Subject: fix module --- app/client/common/select.component.js | 28 ++++++++++------- app/client/modules/pix2wav/views/pix2wav.live.js | 4 +-- app/relay/modules/pix2pix.js | 1 + public/bundle.js | 38 +++++++++++++----------- public/bundle.js.map | 2 +- 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/app/client/common/select.component.js b/app/client/common/select.component.js index f1e441f..fc69e87 100644 --- a/app/client/common/select.component.js +++ b/app/client/common/select.component.js @@ -13,21 +13,29 @@ class Select extends Component { this.props.onChange && this.props.onChange(this.props.name, new_value) } render() { - const value = this.props.opt[this.props.name] + const currentValue = this.props.opt[this.props.name] let lastValue const options = (this.props.options || []).map((key,i) => { let name, value - if (typeof key === 'object' && key.length) { - [name, value] = key - } - else if (typeof key === 'string') { + if (typeof key === 'string') { name = key.length < 4 ? key.toUpperCase() : key value = key - } else { - let frames = Math.round(key.count / 30) + ' s.' - name = key.name.replace(/_/g, ' ') + ' (' + frames + ')' - value = key.name } + else if (typeof key === 'object') { + if (key.length) { + [name, value] = key + } + else if (key.count) { + let frames = Math.round(key.count / 30) + ' s.' + name = key.name.replace(/_/g, ' ') + ' (' + frames + ')' + value = key.name + } + else { + name = key.name + value = key.value || key.name + } + } + console.log(key, name, value) lastValue = value return (