Merge pull request #234 from Tyriar/233_fix_cursor_on_top_of_ime

Ensure composition view is on top of cursor

diff --git a/AUTHORS b/AUTHORS
index 9d8ffb79ce2b45566f63927e281a6662eb482642..0f1d6c312581a61c8c4a6497093222b2ba2389d0 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,11 @@
 List of xterm.js contributors. Updated before every release.
 
+Alessandro Nadalin <alessandro.nadalin@gmail.com>
 Alexander Olsson <noseglid@gmail.com>
 Antonis Kalipetis <akalipetis@sourcelair.com>
+Anton Skshidlevsky <meefik@gmail.com>
 Austin Robertson <austinrobertson@gmail.com>
+ayapi <colors.aya@gmail.com>
 Benjamin Fischer <benjamin.fischer@rwth-aachen.de>
 Carson Anderson <carson@betterservers.com>
 Christopher Jeffrey <chjjeffrey@gmail.com>
@@ -17,3 +20,4 @@ Paris Kasidiaris <paris@sourcelair.com>
 runarberg <runar@greenqloud.com>
 Steven Silvester <steven.silvester@ieee.org>
 Thanasis Daglis <thanasis@sourcelair.com>
+Tine Jozelj <tine.jozelj@outlook.com>

diff --git a/README.md b/README.md
index f75a0a465b0acf146d8f6831963ea56812361d77..4aa63cc09ead21926d9e7915b7a739a7eaf1c421 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # xterm.js
 
-![xterm.js build status](https://api.travis-ci.org/sourcelair/xterm.js.svg)
+![xterm.js build status](https://api.travis-ci.org/sourcelair/xterm.js.svg) [![Gitter](https://badges.gitter.im/sourcelair/xterm.js.svg)](https://gitter.im/sourcelair/xterm.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Xterm.js is a terminal front-end component written in JavaScript that works in the browser.
 

diff --git a/bower.json b/bower.json
index 409fe2137ecefd7a51c0fbbf42fe754680e34df2..3c40d381f48ead822b3d8e5c4cd06e294f2153c6 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,5 @@
 {
   "name": "xterm.js",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "ignore": ["demo", "test", ".gitignore"]
 }

diff --git a/package.json b/package.json
index f70619de976d140a949d6e544340d4b1fcc64c8b..1c8cb856c139cd155b00d3f5b9c84c14428e8715 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xterm",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "ignore": [
     "demo",
     "test",

diff --git a/src/xterm.js b/src/xterm.js
index ae29df0bfb362f58fc76a65d83eab5ecdbea2e31..b7032b395ae887ff7b0f815c47a19a5e0d01f6dd 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -425,6 +425,10 @@
      * @param {Event} ev The scroll event.
      */
     Viewport.prototype.onScroll = function(ev) {
+      if (this.isApplicationMode) {
+        // Scrolling via the scroll bar is disabled during application mode
+        return;
+      }
       var newRow = Math.round(this.viewportElement.scrollTop / this.currentRowHeight);
       var diff = newRow - this.terminal.ydisp;
       this.terminal.scrollDisp(diff, true);