cleanup term.js and pages

Author: hackeris

entry/src/main/ets/pages/Index.ets

@@ -24,10 +24,6 @@ class NativeProxy {
     this.webviewController = webviewController
   }
 
-  propUpdate(key: object, value: object): void {
-    hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'propUpdate: ' + key + ", value: " + value);
-  }
-
   sendInput(data: string): void {
     hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'sendInput: ' + data);
     let buffer = stringToArrayBuffer(data, 'utf-8');
@@ -40,32 +36,11 @@ class NativeProxy {
     napi.resize(s.width, s.height)
   }
 
-  focus(): void {
-    hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'focus')
-  }
-
-  syncFocus(): void {
-    hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'syncFocus')
-  }
-
-  newScrollHeight(h: number): void {
-    hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'newScrollHeight: ' + h)
-  }
-
-  newScrollTop(h: number): void {
-    hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'newScrollTop: ' + h)
-  }
-
-  openLink(url: string): void {
-    hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'openLink: ' + url)
-  }
-
   async load(): Promise<void> {
+
     hilog.info(DOMAIN, 'WebTerminal', '%{public}s', 'load')
     this.webviewController.runJavaScript('exports.setFocused(true)')
 
-    const s: Size = await this.getSize();
-
     napi.onData((a: ArrayBuffer) => {
       let dec = util.TextDecoder.create('utf-8', { ignoreBOM: true })
       let s: string = dec.decodeToString(new Uint8Array(a))
@@ -75,14 +50,14 @@ class NativeProxy {
       this.webviewController.runJavaScript('exports.write("' + s + '")')
     })
 
+    const s: Size = await this.getSize();
     napi.run(s.width, s.height)
   }
 
   private async getSize(): Promise<Size> {
     const ext = await this.webviewController.runJavaScriptExt('exports.getSize()');
     const arr = ext.getArray();
-    const w = arr[0] as number, h = arr[1] as number;
-    return { width: w, height: h };
+    return { width: arr[0] as number, height: arr[1] as number };
   }
 }
 
@@ -111,8 +86,7 @@ struct Index {
         .javaScriptProxy({
           object: this.native,
           name: 'native',
-          methodList: ['propUpdate', 'sendInput', 'resize', 'focus', 'syncFocus',
-            'newScrollHeight', 'newScrollTop', 'openLink', 'load', 'syncFocus'],
+          methodList: ['sendInput', 'resize', 'load'],
           controller: this.webviewController,
           asyncMethodList: [],
           permission: `{

entry/src/main/resources/rawfile/term.js

@@ -39,18 +39,9 @@ function onTerminalReady() {
     term.io.push();
     term.reset();
 
-    let oldProps = {};
-
-    function syncProp(name, value) {
-        if (oldProps[name] !== value) {
-            native.propUpdate(name, value);
-        }
-    }
-
     let decoder = new TextDecoder();
     exports.write = (data) => {
         term.io.writeUTF16(decoder.decode(lib.codec.stringToCodeUnitArray(data)));
-        syncProp('applicationCursor', term.keyboard.applicationCursor);
     };
 
     // hterm size updates native size
@@ -69,22 +60,14 @@ function onTerminalReady() {
             e.stopPropagation();
         }
     }, { capture: true });
-    term.scrollPort_.screen_.addEventListener('mousedown', (e) => {
-        // Taps while there is a selection should be left to the selection view
-        if (document.getSelection().rangeCount != 0) {
-            return;
-        }
-        native.focus();
-    });
+
     exports.setFocused = (focus) => {
         if (focus) {
             term.focus();
         } else {
             term.blur();
         }
     };
-    term.scrollPort_.screen_.addEventListener('focus', (e) => native.syncFocus());
-
     // Scroll to bottom wrapper
     exports.scrollToBottom = () => term.scrollEnd();
     // Set scroll position
@@ -94,30 +77,6 @@ function onTerminalReady() {
         lastScrollTop = term.scrollPort_.screen_.scrollTop;
     };
 
-    // Send scroll height and position to native code
-    let lastScrollHeight, lastScrollTop;
-
-    function syncScroll() {
-        const scrollHeight = parseFloat(term.scrollPort_.scrollArea_.style.height);
-        if (scrollHeight != lastScrollHeight) {
-            native.newScrollHeight(scrollHeight);
-        }
-        lastScrollHeight = scrollHeight;
-
-        const scrollTop = term.scrollPort_.screen_.scrollTop;
-        if (scrollTop != lastScrollTop) {
-            native.newScrollTop(scrollTop);
-        }
-        lastScrollTop = scrollTop;
-    }
-
-    const realSyncScrollHeight = hterm.ScrollPort.prototype.syncScrollHeight;
-    hterm.ScrollPort.prototype.syncScrollHeight = function () {
-        realSyncScrollHeight.call(this);
-        syncScroll();
-    };
-    term.scrollPort_.screen_.addEventListener('scroll', syncScroll);
-
     exports.updateStyle = ({
         foregroundColor,
         backgroundColor,