refactoring

This commit is contained in:
Devaev Maxim 2021-05-24 08:58:14 +03:00
parent 580d7c1182
commit db192b0769
3 changed files with 7 additions and 14 deletions

View File

@ -31,13 +31,11 @@ import {Keyboard} from "./keyboard.js";
import {Mouse} from "./mouse.js";
export function Hid(get_resolution_callback) {
export function Hid(__getResolution) {
var self = this;
/************************************************************************/
var __get_resolution_callback = get_resolution_callback;
var __recorder = null;
var __keyboard = null;
var __mouse = null;
@ -45,7 +43,7 @@ export function Hid(get_resolution_callback) {
var __init__ = function() {
__recorder = new Recorder();
__keyboard = new Keyboard(__recorder.recordWsEvent);
__mouse = new Mouse(__get_resolution_callback, __recorder.recordWsEvent);
__mouse = new Mouse(__getResolution, __recorder.recordWsEvent);
let hidden_attr = null;
let visibility_change_attr = null;

View File

@ -24,13 +24,11 @@ import {tools, $, $$$} from "../tools.js";
import {Keypad} from "../keypad.js";
export function Keyboard(record_callback) {
export function Keyboard(__recordWsEvent) {
var self = this;
/************************************************************************/
var __record_callback = record_callback;
var __ws = null;
var __online = true;
@ -152,7 +150,7 @@ export function Keyboard(record_callback) {
if (__ws && !$("hid-mute-switch").checked) {
__ws.send(JSON.stringify(event));
}
__record_callback(event);
__recordWsEvent(event);
};
__init__();

View File

@ -27,14 +27,11 @@ import {tools, $} from "../tools.js";
import {Keypad} from "../keypad.js";
export function Mouse(get_resolution_callback, record_callback) {
export function Mouse(__getResolution, __recordWsEvent) {
var self = this;
/************************************************************************/
var __get_resolution_callback = get_resolution_callback;
var __record_callback = record_callback;
var __ws = null;
var __online = true;
var __absolute = true;
@ -237,7 +234,7 @@ export function Mouse(get_resolution_callback, record_callback) {
// - Видим нарушение пропорций
// Так что теперь используются быстре рассчеты через offset*
// вместо getBoundingClientRect().
let res = __get_resolution_callback();
let res = __getResolution();
let ratio = Math.min(res.view_width / res.real_width, res.view_height / res.real_height);
return {
"x": Math.round((res.view_width - ratio * res.real_width) / 2),
@ -304,7 +301,7 @@ export function Mouse(get_resolution_callback, record_callback) {
if (__ws && !$("hid-mute-switch").checked) {
__ws.send(JSON.stringify(event));
}
__record_callback(event);
__recordWsEvent(event);
};
__init__();