diff --git a/src/web/js/events.js b/src/web/js/events.js index ea4a789c2a..6911ed5335 100644 --- a/src/web/js/events.js +++ b/src/web/js/events.js @@ -40,6 +40,8 @@ speaker = $('select').val(), volume = $('input#vol').val(), speed = $('input#speed').val(), + up = $('#use_phonemes').prop('checked'), + uw = $('#use_words').prop('checked'), mps = $('input#monophone_padding_start').val(), mpe = $('input#monophone_padding_end').val(), ppe = $('input#polyphone_padding_end').val(), @@ -51,12 +53,12 @@ + '&mps=' + mps + '&mpe=' + mpe + '&ppe=' + ppe - + '&up=' + $('#use_phonemes').prop('checked') - + '&uw=' + $('#use_words').prop('checked'); + + '&up=' + up + + '&uw=' + uw; ev.preventDefault(); - Url.setState(speaker, sentence, volume, speed, mps, mpe, ppe); + Url.setState(speaker, sentence, volume, speed, up, uw, mps, mpe, ppe); Sound.play(url); return false; diff --git a/src/web/js/initialize.js b/src/web/js/initialize.js index 37b450826f..dd37e159c5 100644 --- a/src/web/js/initialize.js +++ b/src/web/js/initialize.js @@ -35,8 +35,11 @@ $('input#speed').val(speed); $('input#vol').val(volume); - $('#use_phonemes').prop('use_phonemes', Url.getUsePhonemes()); - $('#use_words').prop('use_words', Url.getUseWords()); + console.log('pho', Url.getUsePhonemes()); + console.log('words', Url.getUseWords()); + + $('#use_phonemes').prop('checked', Url.getUsePhonemes()); + $('#use_words').prop('checked', Url.getUseWords()); $('input#monophone_padding_start').val(mps); $('input#monophone_padding_end').val(mpe); diff --git a/src/web/js/url.js b/src/web/js/url.js index 3a97861275..474f0c238e 100644 --- a/src/web/js/url.js +++ b/src/web/js/url.js @@ -162,9 +162,9 @@ state[this._SPEED_KEY] = speed; // TODO: Filter invalid values. state[this._USE_PHONEMES_KEY] = !!usePhonemes; state[this._USE_WORDS_KEY] = !!useWords; - state[this._MONOPHONE_PADDING_START] = monophonePaddingStart; - state[this._MONOPHONE_PADDING_END] = monophonePaddingEnd; - state[this._POLYPHONE_PADDING_END] = polyphonePaddingEnd; + state[this._MONOPHONE_PADDING_START_KEY] = monophonePaddingStart; + state[this._MONOPHONE_PADDING_END_KEY] = monophonePaddingEnd; + state[this._POLYPHONE_PADDING_END_KEY] = polyphonePaddingEnd; json = JSON.stringify(state); diff --git a/web/index.html b/web/index.html index ed59e823f4..39bb8ef7fa 100644 --- a/web/index.html +++ b/web/index.html @@ -24,12 +24,16 @@