remove second cursor

8 years ago · f884b11e16
7 changed files with 16087 additions and 8 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -1,3 +1,4 @@
 node_modules/
 public/
 .esm-cache
+*hterm*
--- a/gulpfile.js
+++ b/gulpfile.js
@ -5,9 +5,9 @@ const babel = require('gulp-babel');
 const shell = require('gulp-shell');
 const del = require('del');

-gulp.task('compress', ['hterm'], () =>
+gulp.task('compress', [], () =>
  gulp
-    .src(['./libapps/hterm_all.js', './src/wetty.js'])
+    .src(['./src/hterm_all.js', './src/wetty.js'])
    .pipe(concat('wetty.js'))
    .pipe(babel())
    .pipe(
@ -28,7 +28,7 @@ gulp.task(
  shell.task(
    [
      'git clone https://chromium.googlesource.com/apps/libapps',
-      'LIBDOT_SEARCH_PATH=$(pwd)/libapps ./libapps/libdot/bin/concat.sh -i ./libapps/hterm/concat/hterm_all.concat -o ./libapps/hterm_all.js',
+      'LIBDOT_SEARCH_PATH=$(pwd)/libapps ./libapps/libdot/bin/concat.sh -i ./libapps/hterm/concat/hterm_all.concat -o ./src/hterm_all.js',
    ],
    {
      verbose: true,
@ -36,4 +36,5 @@ gulp.task(
  ),
 );

-gulp.task('default', ['compress'], () => del(['./libapps']));
+gulp.task('default', ['compress']);
+gulp.task('upgrade', ['hterm', 'compress'], () => del(['./libapps']));
--- a/public/wetty/index.html
+++ b/public/wetty/index.html
@ -35,7 +35,7 @@
  </head>
  <body>
    <div id="overlay"><input type="button" onclick="location.reload();" value="reconnect" /></div>
-    <div id="terminal" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></div>
+    <div id="terminal"></div>
    <script src="/wetty/wetty.min.js"></script>
  </body>
 </html>
--- a/public/wetty/wetty.min.js
+++ b/public/wetty/wetty.min.js
--- a/src/hterm_all.js
+++ b/src/hterm_all.js
--- a/src/wetty.js
+++ b/src/wetty.js
@ -41,10 +41,11 @@ socket.on('connect', () => {
    term.prefs_.set('use-default-window-copy', true);
    term.prefs_.set('send-encoding', 'raw');
    term.prefs_.set('receive-encoding', 'raw');
+    term.prefs_.set('font-size', 14);
    term.scrollPort_.screen_.setAttribute('spellcheck', 'false');
    term.scrollPort_.screen_.setAttribute('autocorrect', 'false');
    term.scrollPort_.screen_.setAttribute('autocomplete', 'false');
-    term.scrollPort_.screen_.setAttribute('contenteditable', 'true');
+    term.scrollPort_.screen_.setAttribute('contenteditable', 'false');

    term.runCommandClass(Wetty, document.location.hash.substr(1));
    socket.emit('resize', {
--- a/wetty.js
+++ b/wetty.js
@ -46,7 +46,7 @@ export default (port, globalsshuser, sshhost, sshport, sshauth, sslopts) => {
    const match = request.headers.referer.match('.+/ssh/.+$');
    const sshAddress = globalsshuser ? `${globalsshuser}@${sshhost}` : sshhost;
    const ssh = match ? `${match[0].split('/ssh/').pop()}@${sshhost}` : sshAddress;
-    const cmd = process.getuid() === 0 && sshhost === 'localhost' ? '/bin/login' : './bin/ssh';
+    const cmd = process.getuid() === 0 && sshhost === 'localhost' ? '/usr/bin/login' : './bin/ssh';
    const args =
      cmd === './bin/ssh'
        ? [ssh, '-p', sshport, '-o', `PreferredAuthentications=${sshauth}`]