Cursor Y position stick during window resizing, dependencies update

Author: nikitaeverywhere

ISSUE_TEMPLATE.md

@@ -1,6 +1,7 @@
 Thank you for reaching WebTerminal project! Just a few guidelines for you:
 
 + Feel free to submit questions and feature requests!
-+ If you are going to submit bug report, please include technical details: Caché version and a way how to reproduce the problem. Please, submit some demonstration code (when appropriate).
++ If you are going to submit bug report, please include technical details: Caché version and a way 
+  how to reproduce the problem. Please, submit some demonstration code (when appropriate).
 + By using search, check if there were no such issues before.
 + Replace this text with your issue! Thanks!

package.json

@@ -5,7 +5,7 @@
   "printableName": "Cache Web Terminal",
   "description": "Web-based terminal emulator for Caché administering.",
   "author": "ZitRo",
-  "version": "4.2.9",
+  "version": "4.2.10",
   "gaID": "UA-83005064-2",
   "releaseNumber": 26,
   "scripts": {
@@ -16,20 +16,20 @@
     "url": "https://github.com/intersystems-ru/webterminal.git"
   },
   "devDependencies": {
-    "babel-core": "^6.9.0",
-    "babel-polyfill": "^6.9.1",
-    "babel-preset-es2015": "^6.9.0",
+    "babel-core": "^6.23.1",
+    "babel-polyfill": "^6.23.0",
+    "babel-preset-es2015": "^6.22.0",
     "babelify": "^7.3.0",
-    "browserify": "^13.1.1",
+    "browserify": "^14.1.0",
     "gulp": "^3.9.1",
     "gulp-cssnano": "^2.1.2",
     "gulp-minify-css": "^1.2.4",
     "gulp-preprocess": "^2.0.0",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.4",
-    "gulp-rimraf": "^0.2.0",
-    "gulp-sass": "^3.0.0",
-    "gulp-uglify": "^2.0.0",
+    "gulp-rimraf": "^0.2.1",
+    "gulp-sass": "^3.1.0",
+    "gulp-uglify": "^2.1.0",
     "preprocessify": "^1.0.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0"

readme.md

@@ -64,28 +64,6 @@ Download the latest version from <a href="http://intersystems-ru.github.io/webte
 After installation, you will be able to access application at `http://[host]:[port]/terminal/` (slash at the end is required).
 Type `/help` there to get more information.
 
-Development
------------
-
-We are glad to see anyone who want to contribute to Caché WEB Terminal development! Check the 
-[developer's](https://github.com/intersystems-ru/webterminal/blob/master/CONTRIBUTING.md) guide.
-
-In short, the "hot start" is extremely easy. Having latest [Git](https://git-scm.com/) and
-[NodeJS](https://nodejs.org/en/) installed (tested on NodeJS v4-6), execute the following:
-
-```sh
-git clone https://github.com/intersystems-ru/webterminal
-cd webterminal                   # enter repository directory
-npm install                      # install all project's dependencies
-
-npm run build                    # build the project
-# OR edit import.bat script (on Windows) and then use only the following command:
-import
-```
-
-Now, in `build` folder you will find `WebTerminal-v*.xml` file. Every time you
-changes is ready to be tested, just run `import`. 
-
 Integration and WebTerminal's API
 ---------------------------------
 
@@ -188,3 +166,25 @@ iFrame.addEventListener("load", function () {
     iFrame.contentWindow.onTerminalInit(myInitHandler); // handle terminal initialization
 });
 ```
+
+WebTerminal Project Development
+-------------------------------
+
+We are glad to see anyone who want to contribute to Caché WEB Terminal development! Check our 
+[developer's guide](https://github.com/intersystems-ru/webterminal/blob/master/CONTRIBUTING.md).
+
+In short, the "hot start" is extremely easy. Having latest [Git](https://git-scm.com/) and
+[NodeJS](https://nodejs.org/en/) installed (tested on NodeJS v4-6), execute the following:
+
+```sh
+git clone https://github.com/intersystems-ru/webterminal
+cd webterminal                   # enter repository directory
+npm install                      # install all project's dependencies
+
+npm run build                    # build the project
+# OR edit import.bat script (on Windows) and then use only the following command:
+import
+```
+
+Now, in `build` folder you will find `WebTerminal-v*.xml` file. Every time you
+changes is ready to be tested, just run `import`. 

src/client/js/output/index.js

@@ -409,7 +409,7 @@ function output (plainText = "") {
  */
 export function getLineByIndex (index) {
 
-    let toPush = Math.max(index - lines.length + 1, 0);
+    const toPush = Math.max(index - lines.length + 1, 0);
 
     if (toPush > 0)
         pushLines(toPush);
@@ -431,10 +431,10 @@ export function getLineByCursorY (y) {
  */
 export function clear () {
     scrollDisplay(1);
-    let i = getTopLineIndex() + getCursorY() - 1,
-        m = lines.length,
-        r = m - i - 1,
-        t = lines.length - getTopLineIndex();
+    const i = getTopLineIndex() + getCursorY() - 1,
+          m = lines.length,
+          r = m - i - 1,
+          t = lines.length - getTopLineIndex();
     pushLines(Math.max(HEIGHT - r, t));
     setCursorX(1);
     setCursorY(1);
@@ -463,11 +463,12 @@ export function scrollDown () {
  */
 function sizeChanged () {
 
-    let tel = document.createElement("span"),
-        testScrollbar = document.createElement("div"),
-        scrollBarWidth,
-        lastOverflowProperty = elements.output.style.overflowY,
-        ow, oh;
+    const originLineIndex = getCurrentLineIndex(),
+          tel = document.createElement("span"),
+          testScrollbar = document.createElement("div"),
+          lastOverflowProperty = elements.output.style.overflowY;
+
+    let scrollBarWidth, ow, oh;
 
     elements.output.style.overflowY = "scroll";
     testScrollbar.className = LINE_CLASS_NAME;
@@ -490,6 +491,7 @@ function sizeChanged () {
     elements.input.style.width = `${ WIDTH * SYMBOL_WIDTH }px`;
 
     elements.output.removeChild(testScrollbar);
+    setCursorYToLineIndex(originLineIndex);
 
     // In case of custom styling when integrating WebTerminal to other solutions, the WebTerminal
     // may be hidden on the page by default. This will cause WebTerminal to set up wrong
@@ -502,7 +504,7 @@ function sizeChanged () {
             + ` WebTerminal's iFrame is visible and is attached to the DOM.`;
         try { console.warn(m); } catch (e) { console.log(m); }
     }
-    
+
     // elements.output.style.width = `${ WIDTH * SYMBOL_WIDTH + scrollBarWidth }px`;
     // elements.output.style.height = `${ HEIGHT * SYMBOL_HEIGHT }px`; = 100%
     // console.log(`S W/H ${ SYMBOL_WIDTH }/${ SYMBOL_HEIGHT } ${ WIDTH }/${ HEIGHT }`);