From 22966ede4673b9258893053e47633484429f0eb5 Mon Sep 17 00:00:00 2001 From: Wonkeun Oh Date: Tue, 23 Aug 2016 19:57:06 +0900 Subject: [PATCH] Code cleanup for remote_input client module. Change-Id: I40651303d0be123a9a696f04b1de08085d211f26 --- ism/data/remote-input/air.htm | 84 ++++----- ism/data/remote-input/airinput.htm | 173 +++++++---------- ism/data/remote-input/mouse.htm | 53 ++---- ism/data/remote-input/tv.htm | 378 +++++++++---------------------------- 4 files changed, 208 insertions(+), 480 deletions(-) diff --git a/ism/data/remote-input/air.htm b/ism/data/remote-input/air.htm index bec19f6..8f91beb 100644 --- a/ism/data/remote-input/air.htm +++ b/ism/data/remote-input/air.htm @@ -17,7 +17,6 @@ @@ -379,5 +338,3 @@ - - diff --git a/ism/data/remote-input/mouse.htm b/ism/data/remote-input/mouse.htm index 8e71f0d..e1fa563 100644 --- a/ism/data/remote-input/mouse.htm +++ b/ism/data/remote-input/mouse.htm @@ -30,31 +30,30 @@ var touch_Moved=0; var scroll_pre_y = 0; - function delay(){ + function delay() { return; } - - function cbAjax(text, headers, callingContext){ + function cbAjax(text, headers, callingContext) { id_num++; return true; } - function sendKeyEvent(keyCode){ + function sendKeyEvent(keyCode) { printLog("Send_Key_Event :("+ keyCode +")"); var bodyVars = {id:id_num, key:'event', value:keyCode} ajaxCaller.postForPlainText("/tizen-temp.htm", bodyVars, cbAjax); } - function sendMouse_KeyEvent(mouseCode){ + function sendMouse_KeyEvent(mouseCode) { //printLog("Send_Mouse_KeyEvent :("+ mouseCode +")"); var bodyVars = {id:id_num, key:'mouse_key', value:mouseCode} ajaxCaller.postForPlainText("/tizen-temp.htm", bodyVars, cbAjax); } - function sendMouse_MoveEvent(coordinate){ + function sendMouse_MoveEvent(coordinate) { printLog("Send_Mouse_MoveEvent :("+ coordinate +")"); var bodyVars = {id:id_num, key:'mouse_move', value:coordinate} ajaxCaller.postForPlainText("/tizen-temp.htm", bodyVars, cbAjax); } - function printLog(str){ - if (!$("#use_debug_checker").prop("checked")){ + function printLog(str) { + if (!$("#use_debug_checker").prop("checked")) { return; } log_box.value = log_box.value +"\n"+ str; @@ -63,10 +62,10 @@ psconsole[0].scrollHeight - psconsole.height() ); } - function clearLog(){ + function clearLog() { log_box.value = "";log_box.value +"\n"+ str; } - function sendScroll(direction, count){ + function sendScroll(direction, count) { for (i = 0 ; i < count ; i++) { @@ -74,28 +73,22 @@ } } -// $(document).bind("touchmove",function(event){ -// event.preventDefault(); -// }); $(document).ready(function() { var pad = document.getElementById( "mousepad" ); pad.focus(); // 3 system hw buttons $("#sys_btn_menu").click(function(event) { - //printLog("menu btn is clicked"); sendKeyEvent(KEY_MENU); pad.focus(); }); $("#sys_btn_home").click(function(event) { - //printLog("home btn is clicked"); sendKeyEvent(KEY_HOME); pad.focus(); }); $("#sys_btn_back").click(function(event) { - //printLog("back btn is clicked"); sendKeyEvent(KEY_BACK); pad.focus(); }); @@ -122,19 +115,18 @@ pre_y = event.touches[0].pageY; return; } + if((event.touches[0].pageX-pre_x == 0) && (event.touches[0].pageY-pre_y == 0)){ - return; + return; } - coordinate = (event.touches[0].pageX-pre_x).toString() + "," + (event.touches[0].pageY-pre_y).toString(); - //printLog("coordinate :"+coordinate); + coordinate = (event.touches[0].pageX-pre_x).toString() + "," + (event.touches[0].pageY-pre_y).toString(); pre_x = event.touches[0].pageX; pre_y = event.touches[0].pageY; sendMouse_MoveEvent(coordinate); }); mousepad.addEventListener("touchend", function(event) { - //printLog("touch end"); pre_x=0; pre_y=0; @@ -155,44 +147,35 @@ var coordinate = event.touches[0].pageY-scroll_pre_y; var direction = 0, count = 0; - if( scroll_pre_y == 0 || coordinate == 0){ + if( scroll_pre_y == 0 || coordinate == 0) { scroll_pre_y = event.touches[0].pageY; return; } - //printLog("scroll move : "+coordinate); - if(coordinate > 0){ + if(coordinate > 0) { direction = MOUSE_SCROLL_DOWN; } - else{ + else { direction = MOUSE_SCROLL_UP; } - if((Math.abs(coordinate)) > 20){ + if((Math.abs(coordinate)) > 20) { count = 5; } - else if ((Math.abs(coordinate)) > 10){ + else if ((Math.abs(coordinate)) > 10) { count = 3; } - else{ + else { count = 2; } - sendScroll(direction, count); scroll_pre_y = event.touches[0].pageY; - //pre_coordinate = coordinate; }); mousescroll.addEventListener("touchend", function(event) { - //printLog("scroll touch end"); scroll_pre_y=0; - }); -// $("#mousepad").on("mousemove", function(event) { -// printLog("mouse move"); -// }); - }); diff --git a/ism/data/remote-input/tv.htm b/ism/data/remote-input/tv.htm index 6a15352..1023fb6 100644 --- a/ism/data/remote-input/tv.htm +++ b/ism/data/remote-input/tv.htm @@ -30,7 +30,6 @@ // Callback incremental index var id_num = 0; - var TV_KEY_POWER = 124; var TV_KEY_SWITCHMODE = 235; var TV_KEY_MENU = 179; @@ -49,6 +48,7 @@ var TV_KEY_CHAN_LIST = 68; var TV_KEY_CHAN_DOWN = 117; + // for touch pad var multi_touched = 0; var touch_started_x = 0; var touch_started_y = 0; @@ -58,9 +58,6 @@ var touch_contentarea_pre_y=0; var air_disabled = 0; - - // for key_input - // Mouse prior coordinate, click flag var pre_x = 0; var pre_y = 0; @@ -80,7 +77,7 @@ var FLUSH_TIMEOUT = 3000; var FLUSH_ENTER_TIMEOUT = 50; var click_start_time = 0; - //var flick_time = 0; + // Backup pre string var pre_str = ""; var pre_pre_str = ""; @@ -88,6 +85,8 @@ var TMP_TIMESTAMP = 0; var EMPTY_CHECKER_TIMEOUT = 10; var latest_typed_timestamp = 0; + + // For air_input var cur_air_mode = 0; var cur_reset_mode = 0; var cur_touch_mode = 0; @@ -105,8 +104,6 @@ var progress_count=0; var cur_mode = 0; - - var WebHelperClientHandler = { onInit : function () { WebHelperClient.log("ON INIT"); @@ -115,11 +112,11 @@ WebHelperClient.initialize(WebHelperClientHandler); - function cbAjax(text, headers, callingContext){ + function cbAjax(text, headers, callingContext) { id_num++; return true; } - function sendKeyEvent(keyCode){ + function sendKeyEvent(keyCode) { event.preventDefault(); WebHelperClient.sendKeyEvent(keyCode); } @@ -133,12 +130,9 @@ event.preventDefault(); if (event.touches.length < 2) { WebHelperClient.log(coordinate); - //alert(coordinate); - //console.log(coordinate); WebHelperClient.sendMouse_MoveEvent(coordinate); } } - function sendWheel_MoveEvent(coordinate) { event.preventDefault(); if (event.touches.length < 2) { @@ -147,41 +141,36 @@ } function sendAir_Input(coordinate) { event.preventDefault(); - //if (event.touches.length < 2) { - WebHelperClient.sendAir_Input(coordinate); - //} + WebHelperClient.sendAir_Input(coordinate); } - - - function removeTmpChar(str){ + function removeTmpChar(str) { if (TMP_CHAR.length < 1) return; if (str.length >= TMP_CHAR.length) { str = str.substring (TMP_CHAR.length); } return str; } - function sendPreeditStr(str){ + function sendPreeditStr(str) { str = removeTmpChar(str); event.preventDefault(); WebHelperClient.updatePreeditString(str); } - - function sendCommitStr(str){ + function sendCommitStr(str) { str = removeTmpChar(str); event.preventDefault(); WebHelperClient.commitString(str); } function inputModeChanged(from, to) { - event.preventDefault(); - var from_div = document.getElementById(from); - from_div.style.display = "none"; - var to_div = document.getElementById(to); - to_div.style.display = "block"; - } - function sendFlushCurStr(){ + event.preventDefault(); + var from_div = document.getElementById(from); + from_div.style.display = "none"; + var to_div = document.getElementById(to); + to_div.style.display = "block"; + } + function sendFlushCurStr() { var entry = document.getElementById( "entry" ); var str = entry.value; - if(str.length > 0){ + if(str.length > 0) { entry.value = TMP_CHAR; pre_str = ""; pre_pre_str = ""; @@ -189,16 +178,16 @@ window.clearInterval(flush_timeout); } } - function show_keypad(){ + function show_keypad() { var entry = document.getElementById( "entry" ); entry.focus(); Android.showKeyboard(); } - function hide_keypad(){ + function hide_keypad() { var entry = document.getElementById( "entry" ); entry.blur(); Android.hideKeyboard(); - setTimeout(function(){ + setTimeout(function() { window.scrollTo(0,1); var entry = document.getElementById( "entry" ); entry.focus(); @@ -218,8 +207,7 @@ bt.style.backgroundSize = "auto 100%"; bt.style.backgroundPosition = "center top"; } - - function home_icon_add(title){ + function home_icon_add(title) { var home_page_uri = "http://moakey.com/tizen_tv/list.php"; var home_icon_uri = "http://" + document.domain +":8182/shortcut_icon.png"; @@ -230,7 +218,7 @@ alert('Add the ' + title +'shortCut icon'); var home_icon_add_frame=document.getElementById("home_icon_add_frame"); home_icon_add_frame.src=naver_UrlScheme; - }else{ + } else { alert("Not surpport in iOS, Tizen "); } } @@ -242,16 +230,15 @@ gry_basic_a = (gry_sum_a/gry_sum_count).toFixed(3); gry_basic_b = (gry_sum_b/gry_sum_count).toFixed(3); gry_basic_g = (gry_sum_g/gry_sum_count).toFixed(3); - if (gry_sum_count%4==0){ + if (gry_sum_count%4==0) { air_click_area.innerHTML="Calibrating" + progress[progress_count]; progress_count++; - if(progress_count >= 5){ + if(progress_count >= 5) { progress_count = 0; } } // air_click_area.innerHTML="a:"+gry_basic_a + " ,b: " + gry_basic_b + ", g:" + gry_basic_g; } - function get_gyro_calibration(event) { event.preventDefault(); var r = event.rotationRate; @@ -259,7 +246,6 @@ make_calibration(r.alpha, r.beta, r.gamma); } } - function gyro_event_listener(event) { event.preventDefault(); @@ -268,21 +254,10 @@ var z = event.accelerationIncludingGravity.z; var r = event.rotationRate; var data; - /* - gry_basic_a = x; - gry_basic_b = y; - gry_basic_g = z; - */ var gyro_a = r.alpha - gry_basic_a; var gyro_b = r.beta - gry_basic_b; var gyro_g = r.gamma - gry_basic_g; - //var acc_x = x*10; //for libMoveaEngine - //var acc_y = y*10; - //var acc_z = z*10; - //var acc_x = x; - //var acc_y = y; - //var acc_z = z; var UserAgent = navigator.userAgent.toLowerCase(); if(UserAgent.indexOf("android") != -1 ) { @@ -290,89 +265,50 @@ gyro_b *=100; gyro_g *=100; } - /* - var xz_force = Math.sqrt(x * x + z * z); - var x_sin = x / xz_force; - var z_sin = z / xz_force; - var x_0 = z_sin * gyro_g; - var y_0 = z_sin * gyro_a; - var x_1 = -x_sin * gyro_a; - var y_1 = x_sin * gyro_g - - var x_offset = (- x_sin * gyro_a - z_sin * gyro_g); - var y_offset = (x_sin * gyro_g - z_sin * gyro_a); - air_delta = parseInt(Math.sqrt(x_offset*x_offset + y_offset*y_offset)); - */ - /* - if (air_delta >= 10){ - air_disabled = 0; - } - */ if((x!=null || y!=null || z!=null || r!=null) && (air_disabled == 0)) { - //data = parseInt(x_offset).toString() + "," + parseInt(y_offset).toString(); - // data = parseInt(x_0).toString() + "," + parseInt(y_0).toString() + "," + parseInt(x_1).toString() + "," + parseInt(y_1).toString(); - - /* - if(UserAgent.indexOf("iphone") != -1){ - //data = parseInt(x_offset*(-1)).toString() + "," + parseInt(y_offset*(-1)).toString(); - } - */ data = x.toFixed(3).toString() + "," + y.toFixed(3).toString() + "," + z.toFixed(3).toString() + "," + gyro_a.toFixed(3).toString() + "," + gyro_b.toFixed(3).toString() + "," + gyro_g.toFixed(3).toString() + ","; - //data = acc_x.toFixed(4).toString() + "," + acc_y.toFixed(4).toString() + "," + acc_z.toFixed(4).toString() + "," + gyro_a.toFixed(4).toString() + "," + gyro_b.toFixed(4).toString() + "," + gyro_g.toFixed(4).toString() + ","; - //data = acc_x.toFixed(4) + "," + acc_y.toFixed(4) + "," + acc_z.toFixed(4) + "," + gyro_a.toFixed(4) + "," + gyro_b.toFixed(4) + "," + gyro_g.toFixed(4) + ","; sendAir_Input(data); - //air_click_area.innerHTML=data; } } - function Enable_calibration(checker){ - if (checker == true){ + function Enable_calibration(checker) { + if (checker == true) { imageModeChanged("reset_bt.png","reset_bt"); cur_reset_mode = 1; window.addEventListener('devicemotion', get_gyro_calibration); } - else{ + else { imageModeChanged("reset_bt_pressed.png","reset_bt"); window.removeEventListener('devicemotion', get_gyro_calibration); cur_reset_mode = 0; air_click_area.innerHTML="" } } - - function DisableMode(mode) - { + function DisableMode(mode) { cur_mode = 0; - if (mode == "a") - { + if (mode == "a") { imageModeChanged("a_bt_pressed.png","type_a"); if(window.DeviceMotionEvent) { window.removeEventListener('devicemotion', gyro_event_listener); - //forceEnable_air=0; air_click_area.innerHTML=""; - } } - else if(mode =="b") - { + else if(mode =="b") { imageModeChanged("b_bt_pressed.png","type_b"); if(window.DeviceMotionEvent) { window.removeEventListener('devicemotion', gyro_event_listener); - //forceEnable_air=0; air_click_area.innerHTML=""; } } - else if (mode =="c") - { + else if (mode =="c") { imageModeChanged("c_bt_pressed.png","type_c"); } } - function EnableMode(mode) - { + function EnableMode(mode) { cur_mode = mode; - if (mode == "a") - { + if (mode == "a") { imageModeChanged("a_bt.png","type_a"); imageModeChanged("b_bt_pressed.png","type_b"); imageModeChanged("c_bt_pressed.png","type_c"); @@ -384,8 +320,7 @@ air_click_area.innerHTML="click"; } } - else if(mode =="b") - { + else if(mode =="b") { imageModeChanged("b_bt.png","type_b"); imageModeChanged("a_bt_pressed.png","type_a"); imageModeChanged("c_bt_pressed.png","type_c"); @@ -393,11 +328,9 @@ window.addEventListener('devicemotion', gyro_event_listener); forceEnable_air = 1; air_click_area.innerHTML="click"; - } } - else if (mode =="c") - { + else if (mode =="c") { imageModeChanged("c_bt.png","type_c"); imageModeChanged("a_bt_pressed.png","type_a"); imageModeChanged("b_bt_pressed.png","type_b"); @@ -407,9 +340,8 @@ } } } - - function EnableAirinput(checker){ - if (checker == true){ + function EnableAirinput(checker) { + if (checker == true) { imageModeChanged("air_bt.png","air_input_mode"); cur_air_mode = 1; // Check for support for DeviceMotion events @@ -418,7 +350,7 @@ forceEnable_air = 1; } } - else{ + else { imageModeChanged("air_bt_pressed.png","air_input_mode"); cur_air_mode = 0; if(window.DeviceMotionEvent) { @@ -427,110 +359,106 @@ } } } - - function sendevent(form){ + function sendevent(form) { //alert(form); if (form == "sys_btn_modechange") { inputModeChanged("tvmode", "keymode"); } - else if (form == "sys_btn_home"){ + else if (form == "sys_btn_home") { sendKeyEvent(KEY_HOME); } - else if (form == "sys_btn_back"){ + else if (form == "sys_btn_back") { sendKeyEvent(KEY_BACK); } - else if (form == "sys_btn_modechange2"){ + else if (form == "sys_btn_modechange2") { inputModeChanged("keymode", "tvmode"); } - else if (form == "sys_btn_home2"){ + else if (form == "sys_btn_home2") { sendKeyEvent(KEY_HOME); } - else if (form == "sys_btn_back2"){ + else if (form == "sys_btn_back2") { sendKeyEvent(KEY_BACK); } - else if (form == "bt_power"){ + else if (form == "bt_power") { sendKeyEvent(TV_KEY_POWER); } - else if (form == "bt_switchmode"){ + else if (form == "bt_switchmode") { sendKeyEvent(TV_KEY_SWITCHMODE); } - else if (form == "bt_menu"){ + else if (form == "bt_menu") { sendKeyEvent(KEY_MENU); } - else if (form == "bt_info"){ + else if (form == "bt_info") { sendKeyEvent(TV_KEY_INFO); } - else if (form == "bt_select"){ + else if (form == "bt_select") { sendKeyEvent(TV_KEY_SELECT); } - else if (form == "bt_back"){ + else if (form == "bt_back") { sendKeyEvent(TV_KEY_BACK); } - else if (form == "bt_exit"){ + else if (form == "bt_exit") { sendKeyEvent(TV_KEY_EXIT); } - else if (form == "bt_volume_up"){ + else if (form == "bt_volume_up") { sendKeyEvent(TV_KEY_VOL_UP); } - else if (form == "bt_mute"){ + else if (form == "bt_mute") { sendKeyEvent(TV_KEY_MUTE); } - else if (form == "bt_channel_up"){ + else if (form == "bt_channel_up") { sendKeyEvent(TV_KEY_CHAN_UP); } - else if (form == "bt_volume_down"){ + else if (form == "bt_volume_down") { sendKeyEvent(TV_KEY_VOL_DOWN); } - else if (form == "bt_channel_list"){ + else if (form == "bt_channel_list") { sendKeyEvent(TV_KEY_CHAN_LIST); } - else if (form == "bt_channel_down"){ + else if (form == "bt_channel_down") { sendKeyEvent(TV_KEY_CHAN_DOWN); } - else if (form == "type_a" || form == "type_b" || form == "type_c"||form == "type_a2" || form == "type_b2" || form == "type_c2"){ - if (cur_mode != form.charAt(5)) - { + else if (form == "type_a" || form == "type_b" || form == "type_c"||form == "type_a2" || form == "type_b2" || form == "type_c2") { + if (cur_mode != form.charAt(5)) { EnableMode(form.charAt(5)); - } - else - { + } + else { DisableMode(form.charAt(5)); - } + } } - else if (form == "air_input_mode" || form == "air_input_mode2"){ + else if (form == "air_input_mode" || form == "air_input_mode2") { if (cur_air_mode == 0 ) { EnableAirinput(true); air_click_area.innerHTML="click"; } - else{ + else { EnableAirinput(false); air_click_area.innerHTML=""; } } - else if (form == "reset_bt" || form == "reset_bt2"){ + else if (form == "reset_bt" || form == "reset_bt2") { Enable_calibration(true); cal_flush_timeout = window.setTimeout(function(){ alert("Finished Gyro Calibration."); Enable_calibration(false);}, CAL_FLUSH_TIMEOUT); } - else if (form == "air_click_area"){ - if (cur_mode == "a" ||cur_mode == "b"){ + else if (form == "air_click_area") { + if (cur_mode == "a" ||cur_mode == "b") { sendMouse_KeyEvent(MOUSE_CLICK); } } - } - function clearLog(){ + function clearLog() { //log_box.value = "";log_box.value +"\n"+ str; } - function reArrangeCursorPos(){ - if(latest_typed_timestamp == TMP_TIMESTAMP){ + function reArrangeCursorPos() { + if(latest_typed_timestamp == TMP_TIMESTAMP) { entry.setSelectionRange(TMP_CHAR.length,TMP_CHAR.length); } window.clearInterval(empty_checker_timeout); } - $(document).ready(function() { + $(document).ready(function(){ var entry = document.getElementById( "entry" ); entry.focus(); entry.value = TMP_CHAR; @@ -548,97 +476,9 @@ }, 300); - - /* - mousepad2.addEventListener("touchstart", function(event) { - //hideTheKeyBoard(); - flick_start_time = new Date; - pre_x = event.touches[0].pageX; - pre_y = event.touches[0].pageY; -// scroll_pre_x = event.touches[0].pageX; -// scroll_pre_y = event.touches[0].pageY; - touch_Pressed=1; - touch_Moved=0; - - if(document.activeElement == document.getElementById( "entry" )) { - sendFlushCurStr(); - document.activeElement.blur(); - } - }); - - mousepad2.addEventListener("touchmove", function(event) { - - var coordinate; - touch_Moved=1; - event.preventDefault(); - if((pre_x==0) && (pre_y==0)) { - pre_x = event.touches[0].pageX; - pre_y = event.touches[0].pageY; - return; - } - if((event.touches[0].pageX-pre_x == 0) && (event.touches[0].pageY-pre_y == 0)) { - return; - } - - coordinate = (event.touches[0].pageX-pre_x).toString() + "," + (event.touches[0].pageY-pre_y).toString(); - sendMouse_MoveEvent(coordinate); - pre_x = event.touches[0].pageX; - pre_y = event.touches[0].pageY; - }); - - mousepad2.addEventListener("touchend", function(event) { - - var coordinate, coordinate2; - var direction = 0, count = 0; -// var flick_end_time = new Date; -// var flick_time = flick_end_time - flick_start_time; - - if(touch_Moved==0&&touch_Pressed==1){ - if(document.activeElement == document.getElementById( "entry" )){ - sendFlushCurStr(); - } - else{ - sendMouse_KeyEvent(MOUSE_CLICK); - } - } - if(document.activeElement == document.getElementById( "entry" )){ - sendFlushCurStr(); - touch_Moved=0; - touch_Pressed=0; - } - else { - //sendMouse_KeyEvent(MOUSE_RELEASED); - touch_Moved=0; - touch_Pressed=0; - } - - }); -*/ -/* - air_click_area.addEventListener("touchstart", function(event) { - event.preventDefault(); - click_start_time = new Date; - touch_Pressed=1; - }); - - air_click_area.addEventListener("touchend", function(event) { - event.preventDefault(); - var coordinate, coordinate2; - var direction = 0, count = 0; - var click_end_time = new Date; - var click_time = click_end_time - click_start_time; - - if(touch_Pressed==1 && click_time < 350){ - sendMouse_KeyEvent(MOUSE_CLICK); - touch_Pressed=0; - } - - }); - */ mousepad.addEventListener("touchstart", function(event) { event.preventDefault(); - //hideTheKeyBoard(); click_start_time = new Date; pre_x = event.touches[0].pageX; pre_y = event.touches[0].pageY; @@ -656,8 +496,6 @@ cur_air_mode = 1; } air_disabled = 1; - - //mousepad.innerHTML = ""; }); mousepad.addEventListener("touchmove", function(event) { @@ -684,22 +522,7 @@ coordinate = (event.touches[0].pageX-pre_x).toString() + "," + (event.touches[0].pageY-pre_y).toString(); - /* - if(touchmove_delta >= 5 && cur_touch_mode ==0){ - cur_air_mode = 0; - mousepad.innerHTML ="air->touch"; - cur_touch_mode = 1; - // mousepad.innerHTML = click_time; - /* - if(window.DeviceMotionEvent && forceEnable_air == 0 ) { - window.removeEventListener('devicemotion', gyro_event_listener); - cur_air_mode = 0; - } - - } - */ - - if (air_delta >= 5 || touchmove_delta >= 5){ + if (air_delta >= 5 || touchmove_delta >= 5) { air_disabled = 0; } @@ -708,13 +531,9 @@ window.removeEventListener('devicemotion', gyro_event_listener); cur_air_mode = 0; } - // if (cur_touch_mode == 1 && cur_air_mode == 0){ sendMouse_MoveEvent(coordinate); - //mousepad.innerHTML ="touch"; - //} pre_x = event.touches[0].pageX; pre_y = event.touches[0].pageY; - //mousepad.innerHTML = ""; }); mousepad.addEventListener("touchend", function(event) { @@ -725,20 +544,18 @@ var click_end_time = new Date; var click_time = click_end_time - click_start_time; - if(document.activeElement == document.getElementById( "entry" )){ + if(document.activeElement == document.getElementById( "entry" )) { sendFlushCurStr(); hide_keypad(); touch_Moved=0; touch_Pressed=0; } - else if(touch_Pressed==1 && click_time < 350){ + else if(touch_Pressed==1 && click_time < 350) { sendMouse_KeyEvent(MOUSE_CLICK); touch_Moved=0; touch_Pressed=0; } - //mousepad.innerHTML =""; - // mousepad.innerHTML = click_time; if(window.DeviceMotionEvent && cur_mode == "c" ) { window.removeEventListener('devicemotion', gyro_event_listener); cur_air_mode = 0; @@ -749,8 +566,6 @@ } cur_touch_mode = 0; air_disabled = 0; - - }); mousescroll.addEventListener("touchstart", function(event) { @@ -774,18 +589,18 @@ document.getElementById( "entry" ).blur(); return; } - if(scroll_pre_y == 0){ + if(scroll_pre_y == 0) { scroll_pre_x = event.touches[0].pageX; scroll_pre_y = event.touches[0].pageY; return; } - if(((event.touches[0].pageX-scroll_pre_x == 0) && (event.touches[0].pageY-scroll_pre_y == 0))||(event.touches[0].pageY-scroll_pre_y == 0)){ + if(((event.touches[0].pageX-scroll_pre_x == 0) && (event.touches[0].pageY-scroll_pre_y == 0))||(event.touches[0].pageY-scroll_pre_y == 0)) { return; } var coordinate = (event.touches[0].pageX-scroll_pre_x).toString()+","+(event.touches[0].pageY-scroll_pre_y).toString(); - if (Math.abs((event.touches[0].pageY-scroll_pre_y)) >= 3){ + if (Math.abs((event.touches[0].pageY-scroll_pre_y)) >= 3) { sendWheel_MoveEvent(coordinate); - } + } scroll_pre_x = event.touches[0].pageX; scroll_pre_y = event.touches[0].pageY; }); @@ -802,7 +617,7 @@ latest_typed_timestamp = cur_timestamp; //To prevent multiline field in textarea when the enter key is typed and send commit string and enter key event - if(this.value.substring(this.value.length - 1) == "\n"){ + if(this.value.substring(this.value.length - 1) == "\n") { this.value = this.value.substring(0, this.value.length - 1); sendFlushCurStr(); entry.value = TMP_CHAR; @@ -812,20 +627,20 @@ return false; } //To prevent removing the TMP_CHAR(first) character for the all time - if(TMP_CHAR.substring(0, TMP_CHAR.length - 1) == this.value){ + if(TMP_CHAR.substring(0, TMP_CHAR.length - 1) == this.value) { entry.value = TMP_CHAR; TMP_TIMESTAMP = cur_timestamp; empty_checker_timeout = window.setInterval("reArrangeCursorPos()", EMPTY_CHECKER_TIMEOUT); return false; } //To prevent duplicating preedit string error for Note2, S3 web browser - if(pre_str == this.value){ + if(pre_str == this.value) { return; } /*To prevent wrong preedit string error for Tizen phone, when next character is made in CJK correct event must happen like [pre_str:가 for 간 -> preedit:간 -> pre_str: 간 for 가나 -> preedit:가나 ] wrong event happen from tizen [pre_str:가 for 간 -> preedit:간 -> preedit:가나 -> pre_str: 가 for 가나 -> preedit: 가 -> pre_str: 간 for 가 ] */ - if(pre_pre_str == this.value){ + if(pre_pre_str == this.value) { return; } pre_pre_str = pre_str; @@ -835,7 +650,7 @@ if(this.value.substring(this.value.length - 1) == " ") { sendFlushCurStr(); } - else{ + else { flush_timeout = window.setInterval("sendFlushCurStr()", FLUSH_TIMEOUT); sendPreeditStr(this.value); } @@ -849,7 +664,7 @@ latest_typed_timestamp = cur_timestamp; //To prevent multiline field in textarea when the enter key is typed and send commit string and enter key event - if(this.value.substring(this.value.length - 1) == "\n"){ + if(this.value.substring(this.value.length - 1) == "\n") { this.value = this.value.substring(0, this.value.length - 1); sendFlushCurStr(); entry.value = TMP_CHAR; @@ -859,20 +674,20 @@ return false; } //To prevent removing the TMP_CHAR(first) chartor for the all time - if(TMP_CHAR.substring(0, TMP_CHAR.length - 1) == this.value){ + if(TMP_CHAR.substring(0, TMP_CHAR.length - 1) == this.value) { entry.value = TMP_CHAR; TMP_TIMESTAMP = cur_timestamp; empty_checker_timeout = window.setInterval("reArrangeCursorPos()", EMPTY_CHECKER_TIMEOUT); return false; } //To prevent duplicating preedit string error for Note2, S3 web browser - if(pre_str == this.value){ + if(pre_str == this.value) { return; } /*To prevent wrong preedit string error for Tizen phone, when next character is made in CJK correct event must happen like [pre_str:가 for 간 -> preedit:간 -> pre_str: 간 for 가나 -> preedit:가나 ] wrong event happen from tizen [pre_str:가 for 간 -> preedit:간 -> preedit:가나 -> pre_str: 가 for 가나 -> preedit: 가 -> pre_str: 간 for 가 ] */ - if(pre_pre_str == this.value){ + if(pre_pre_str == this.value) { return; } pre_pre_str = pre_str; @@ -882,7 +697,7 @@ if(this.value.substring(this.value.length - 1) == " ") { sendFlushCurStr(); } - else{ + else { flush_timeout = window.setInterval("sendFlushCurStr()", FLUSH_TIMEOUT); sendPreeditStr(this.value); } @@ -898,7 +713,7 @@ sendKeyEvent(event.keyCode); //To remove the last preedit charator, when tap the backspace key - }else if(this.value.length > TMP_CHAR.length && TMP_CHAR == this.value.substring(0, this.value.length - 1) && event.keyCode == KEY_BACKSPACE){ + } else if(this.value.length > TMP_CHAR.length && TMP_CHAR == this.value.substring(0, this.value.length - 1) && event.keyCode == KEY_BACKSPACE) { sendKeyEvent(event.keyCode); } }); @@ -925,14 +740,7 @@ - - - -
@@ -970,7 +778,6 @@
- @@ -985,7 +792,6 @@ - @@ -1028,7 +834,7 @@ - mousescroll + @@ -1046,5 +852,3 @@ - - -- 2.7.4