Fixes #535

ironmansoftware · Jan 9, 2019 · c020a1f · c020a1f
1 parent e8bddc5
commit c020a1f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/client/src/app/ud-input-field.jsx b/src/client/src/app/ud-input-field.jsx
@@ -115,6 +115,10 @@ export default class UdInputField extends React.Component {
         $('.tooltipped').tooltip();
     }
 
+    onKeyDown(e) {
+        if (e.keyCode == 13) { this.props.onEnter(e); }
+    }
+
     render() {
         var field = {
             name: this.props.name,
@@ -141,9 +145,9 @@ export default class UdInputField extends React.Component {
             var textfield = null;
             if (this.props.debounceTimeout == null) {
 
-                textfield = <input id={field.name} name={field.name} type={type} onChange={e => this.onTextFieldChange(field, e) } value={field.value} onBlur={e => this.onValidateField(field, e)}/>
+                textfield = <input id={field.name} name={field.name} type={type} onChange={e => this.onTextFieldChange(field, e) } value={field.value} onBlur={e => this.onValidateField(field, e)} onKeyDown={this.onKeyDown.bind(this)}/>
             } else {
-                textfield = <DebounceInput id={field.name} name={field.name} onChange={e => this.onTextFieldChange(field, e) } value={field.value} debounceTimeout={this.props.debounceTimeout}/>
+                textfield = <DebounceInput id={field.name} name={field.name} onChange={e => this.onTextFieldChange(field, e) } value={field.value} debounceTimeout={this.props.debounceTimeout}  onKeyDown={this.onKeyDown.bind(this)}/>
             }
 
             return <div className="input-field">
@@ -155,7 +159,7 @@ export default class UdInputField extends React.Component {
 
         if (field.type === 'textarea') {
             return <div className="input-field">
-                        <textarea className="materialize-textarea" id={field.name} name={field.name} type="textarea" onChange={e => this.onTextFieldChange(field, e) } value={field.value}/>
+                        <textarea className="materialize-textarea" id={field.name} name={field.name} type="textarea" onChange={e => this.onTextFieldChange(field, e) } value={field.value}  onKeyDown={this.onKeyDown.bind(this)}/>
                         <label id={field.name + 'label'} htmlFor={field.name} style={{color: this.props.fontColor}}>{field.placeholder ? field.placeholder[0] : field.name}</label>
                     </div>
         }

diff --git a/src/client/src/app/ud-input.jsx b/src/client/src/app/ud-input.jsx
@@ -73,6 +73,8 @@ export default class Input extends React.Component {
     onSubmit(e) {
         e.preventDefault();
 
+        if (!this.state.canSubmit) return;
+
         this.setState({
             loading: true
         })
@@ -166,7 +168,7 @@ export default class Input extends React.Component {
         }
 
         var fields = this.state.fields.map(x => {
-            return <UdInputField validate={this.props.validate} key={x.name} {...x} fontColor={this.props.fontColor} onValueChanged={this.onValueChanged.bind(this)} onValidating={this.onValidating.bind(this)} onValidateComplete={this.onValidateComplete.bind(this)}/>
+            return <UdInputField validate={this.props.validate} key={x.name} {...x} fontColor={this.props.fontColor} onValueChanged={this.onValueChanged.bind(this)} onValidating={this.onValidating.bind(this)} onValidateComplete={this.onValidateComplete.bind(this)} onEnter={this.onSubmit.bind(this)}/>
         });
 
         var actions = null 

diff --git a/src/client/src/app/ud-navbar.jsx b/src/client/src/app/ud-navbar.jsx
@@ -35,10 +35,16 @@ export default class UdNavbar extends React.Component {
             dPage = this.props.pages[0];
         }
 
+        var href = dPage.name;
+        if (href != null) {
+            href = `/${dPage.name.replace(/ /g, "-")}`;
+        }
+
         return <nav style={{backgroundColor: this.props.backgroundColor, color: this.props.fontColor}} className="ud-navbar">
                     <UdNavigation pages={this.props.pages} togglePaused={this.props.togglePaused} showPauseToggle={this.props.showPauseToggle}/>
+
 
-                    <a href={`/${dPage.name.replace(/ /g, "-")}`} style={{paddingLeft: '10px', fontSize: '2.1rem'}}>
+                    <a href={href} style={{paddingLeft: '10px', fontSize: '2.1rem'}}>
                         {logo}  <span>{this.props.text}</span>
                     </a>
                     {