From 8d2637ea72e8bd4f1f4929361ef7f0dd4852eac7 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 6 Mar 2016 04:28:31 -0500 Subject: [PATCH] JS/UI for sending volume --- src/web/css/style.css | 13 ++++++++++--- src/web/js/events.js | 9 +++++---- src/web/js/initialize.js | 7 +++++-- src/web/js/ui.js | 4 ++-- src/web/js/url.js | 23 +++++++++++++++++++---- web/index.html | 1 + 6 files changed, 42 insertions(+), 15 deletions(-) diff --git a/src/web/css/style.css b/src/web/css/style.css index 3be6c21195..88f9d07145 100644 --- a/src/web/css/style.css +++ b/src/web/css/style.css @@ -7,12 +7,19 @@ h1 { } input { - width: 70%; border: 1px solid #ccc; padding: 8px; margin-bottom: 1em; } +input#text { + width: 70%; +} + +input#vol { + width: 30px; +} + button { background-color: #eee; border: 1px solid #ccc; @@ -42,13 +49,13 @@ select { } -.error input { +.error input#text { border-color: #f55; background-color: #fee; color: #500; } -.ok input { +.ok input#text { border-color: #5a5; background-color: #efe; } diff --git a/src/web/js/events.js b/src/web/js/events.js index df4d56b604..0144f5e157 100644 --- a/src/web/js/events.js +++ b/src/web/js/events.js @@ -6,7 +6,7 @@ window.Events = { /** Handle user input inside the input box. */ handleTyping: function(ev) { - var sentence = $('input').val(); + var sentence = $('input#text').val(); if (ev.keyCode === 27) { $(this).val(''); // ESC key. @@ -20,7 +20,7 @@ handleBodyTyping: function(ev) { if (ev.keyCode === 27) { // Handle ESC key. - $('input').select(); + $('input#text').select(); Ui.clearInput(); Ui.clearSuggestedWords(); Ui.setFromInput(''); @@ -38,12 +38,13 @@ var $audio = $('#sound'), sentence = $('#text').val(), speaker = $('select').val(), + volume = $('input#vol').val(), query = encodeURIComponent(sentence), - url = '/speak?v=' + speaker + '&s=' + query; + url = '/speak?v=' + speaker + '&s=' + query + '&vol=' + volume; ev.preventDefault(); - Url.setState(speaker, sentence); + Url.setState(speaker, sentence, volume); Sound.play(url); return false; diff --git a/src/web/js/initialize.js b/src/web/js/initialize.js index 0151b0ae6b..54cdebefc6 100644 --- a/src/web/js/initialize.js +++ b/src/web/js/initialize.js @@ -6,7 +6,7 @@ /** Install event handlers. */ var installEventHandlers = function() { $('form').submit(function(ev) { return Events.handleFormSubmit(ev); }); - $('input').on('keyup', function(ev) { return Events.handleTyping(ev); }); + $('input#text').on('keyup', function(ev) { return Events.handleTyping(ev); }); $('body').on('keyup', function(ev) { return Events.handleBodyTyping(ev); }); $('select').on('change', function(ev) { return Events.handleVoiceSelect(ev); }); } @@ -15,6 +15,7 @@ var uiInitialize = function() { var sentence = Url.getSentence(), speaker = Url.getSpeaker() || Library.getDefaultSpeaker(), + volume = Url.getVolume() || 1.0, // TODO: Better place for default volume urlPreviousState = false; if (speaker) { @@ -22,10 +23,12 @@ } if (sentence.length > 0) { - $('input').val(sentence); + $('input#text').val(sentence); urlPreviousState = true; } + $('input#vol').val(volume); + Library.load(function(library) { Ui.libraryLoadCallback(library); }); Sound.install(); diff --git a/src/web/js/ui.js b/src/web/js/ui.js index 1656542f15..8242800aac 100644 --- a/src/web/js/ui.js +++ b/src/web/js/ui.js @@ -40,7 +40,7 @@ /** Clear the input box. */ clearInput: function() { - $('input').val(''); + $('input#text').val(''); }, // TODO: Rename, redesign. @@ -58,7 +58,7 @@ /** Set state with respect to input. */ setStateFromInput: function() { - var rawSentence = $('input').val(); + var rawSentence = $('input#text').val(); if (this.currentVocabulary.checkSentence(rawSentence)) { this.setState('ok'); } else { diff --git a/src/web/js/url.js b/src/web/js/url.js index 0d075a6514..1fd35c3575 100644 --- a/src/web/js/url.js +++ b/src/web/js/url.js @@ -10,6 +10,9 @@ /** JSON key for the `sentence` param. */ _SENTENCE_KEY: 's', + /** JSON key for the `volume` param. */ + _VOLUME_KEY: 'vol', + /** Get the sentence from the `window.location`. */ getSentence: function() { var state = this.parseState(window.location), @@ -32,24 +35,36 @@ } }, + /** Get the volume from the `window.location`. */ + getVolume: function() { + var state = this.parseState(window.location); + if (!state || !(this._VOLUME_KEY in state)) { + return null; + } else { + return state[this._VOLUME_KEY]; + } + }, + // TODO: Independent functions to set both speaker and sentence separately. - /** Set the `window.history` speaker and sentence. */ - setState: function(speaker, rawSentence) { - var urlHash = this.fromSpeakerAndSentence(speaker, rawSentence); + /** Set the `window.history` speaker, volume, and sentence. */ + setState: function(speaker, rawSentence, volume) { + var urlHash = this.fromParams(speaker, rawSentence, volume); console.log('set state, urlhash = ', urlHash); window.history.replaceState(null, null, urlHash); }, /** Encode a speaker and sentence in a URL hash. */ - fromSpeakerAndSentence: function(speaker, rawSentence) { + fromParams: function(speaker, rawSentence, volume) { var cleanedSentence = SentenceHelper.cleanSentence(rawSentence), cleanedSpeaker = speaker, // TODO: Check against speakers. + cleanedVolume = volume, // TODO: Filter invalid values. state = {}, json = null, uriEncoded = null; state[this._SPEAKER_KEY] = cleanedSpeaker; state[this._SENTENCE_KEY] = cleanedSentence; + state[this._VOLUME_KEY] = cleanedVolume; json = JSON.stringify(state); diff --git a/web/index.html b/web/index.html index 2a03114109..db6c93646f 100644 --- a/web/index.html +++ b/web/index.html @@ -19,6 +19,7 @@ +