static/js/main.js

@@ -143,27 +143,20 @@ function textKeyUpHandler(e) {
 
 function liveTextKeyUpHandler(e) {
   const value = e.target.value
-  const size = value.length
-
-  const messages = []
-
-  if (size > 0) {
-    messages.push('{"type":"text","value": "' + (value.replace('"', '\\"')) + '"}')
-
-    if (value[size-1] === ' ') {
-      messages.push('{"type":"key","value":"space"}')
-    }
-  }
 
   if (e.keyCode === 8) {
-    messages.push('{"type":"key","value": "backspace"}')
-  } else if (e.keyCode === 13 && size === 0) {
-    messages.push('{"type":"key","value": "enter"}')
+    send('{"type":"key","value": "backspace"}')
+  } else if (e.keyCode === 13) {
+    send('{"type":"key","value": "enter"}')
+  } else if (value.length) {
+    if (value === ' ') {
+      send('{"type":"key","value": "space"}')
+    } else {
+      send('{"type":"text","value": "' + (value.replace('"', '\\"')) + '"}')
+    }
+
+    e.target.value = ''
   }
-
-  send(`{"type":"messages","value":[${messages.join(',')}]}`)
-
-  e.target.value = ''
 }
 
 function shortcutsSpecialKeysOnChangeHandler(e) {
@@ -317,26 +310,7 @@ function addListeners() {
   addEventListenerOn('#text-clear', 'click', textClearClickHandler)
   addEventListenerOn('#text-send', 'click', textSendClickHandler)
   addEventListenerOn('#text', 'keyup', textKeyUpHandler)
-
-  Array.from(document.querySelectorAll('.live-text')).forEach((element) => {
-    element.setAttribute('data-composing', '0')
-
-    addEventListenerOn(element, 'compositionstart', (e) => {
-      element.setAttribute('data-composing', '1')
-    })
-
-    addEventListenerOn(element, 'compositionend', (e) => {
-      element.setAttribute('data-composing', '0')
-    })
-
-    addEventListenerOn(element, 'keyup', (e) => {
-      if (element.getAttribute('data-composing') === '1') {
-        return
-      }
-
-      liveTextKeyUpHandler(e)
-    })
-  })
+  addEventListenerOn('.live-text', 'keyup', liveTextKeyUpHandler)
 
   addEventListenerOn(scroller, 'touchstart', scrollerTouchStartHandler)
   addEventListenerOn(scroller, 'touchmove', scrollerTouchMoveHandler)

templates/page/home.html

@@ -30,8 +30,7 @@
 
                         {{if eq $value.Type "live_text"}}
                             <div class="form-group col-12">
-                                <input type="text" class="form-control live-text" name="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">
-                                <pre></pre>
+                                <input type="text" class="form-control live-text" name="text">
                             </div>
                         {{end}}
 
@@ -116,7 +115,7 @@
                                         <input type="checkbox"> Screen
                                     </label>
                                 </div>
-                                <input type="text" id="mouse-text-live" class="form-control live-text" placeholder="Live text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">
+                                <input type="text" id="mouse-text-live" class="form-control live-text" placeholder="Live text">
                             </div/>
                             <div id="scrollbar"></div>
                             <div id="pointer"></div>