From af39a3fcc069ab908163dcdd731c00592a83c157 Mon Sep 17 00:00:00 2001 From: paris Date: Mon, 19 Jan 2015 19:06:17 +0200 Subject: [PATCH 1/2] Fix #8 Also fix some Internet Explorer incompatibilities --- demo/main.js | 2 +- src/xterm.css | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/demo/main.js b/demo/main.js index 05becab1..a4b1dd88 100644 --- a/demo/main.js +++ b/demo/main.js @@ -17,7 +17,7 @@ term.prompt(); term.on('key', function (key, ev) { var printable = (!ev.altKey && !ev.altGraphKey && !ev.ctrlKey && !ev.metaKey); - if (ev.keyIdentifier == 'Enter') { + if (ev.keyCode == 13) { term.prompt(); } else if (ev.keyCode == 8) { /* diff --git a/src/xterm.css b/src/xterm.css index 32ef364b..815295d2 100644 --- a/src/xterm.css +++ b/src/xterm.css @@ -32,28 +32,31 @@ */ /* -* Default style for xterm.js -*/ + * Default style for xterm.js + */ -.xterm { +.terminal { background-color: #000; color: #fff; - outline: none; font-family: courier-new, courier, monospace; position: relative; } -.xterm .terminal-cursor { +.terminal:focus { + outline: none; +} + +.terminal .terminal-cursor { background-color: #fff; color: #000; } -.xterm .xterm-helpers { +.terminal .xterm-helpers { position: absolute; top: 0; } -.xterm .xterm-helper-textarea { +.terminal .xterm-helper-textarea { opacity: 0; width: 0; height: 0; @@ -61,8 +64,8 @@ } /* -* Determine default colors for xterm.js -*/ + * Determine default colors for xterm.js + */ .terminal .xterm-bold { font-weight: bold; } From 391d8f409705b781683f42d5532595926d87b927 Mon Sep 17 00:00:00 2001 From: paris Date: Mon, 19 Jan 2015 19:07:28 +0200 Subject: [PATCH 2/2] Bump version to 0.29 and copyright year to 2015 --- README.md | 2 +- docs/conf.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fbc53016..643db425 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,6 @@ If you contribute code to this project, you are implicitly allowing your code to ## License -Copyright (c) 2014, SourceLair, Ltd (www.sourcelair.com) (MIT License) +Copyright (c) 2014-2015, SourceLair, Ltd (www.sourcelair.com) (MIT License) Copyright (c) 2012-2013, Christopher Jeffrey (MIT License) diff --git a/docs/conf.py b/docs/conf.py index 3eb1b3cf..a0e298e4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,16 +44,16 @@ master_doc = 'index' # General information about the project. project = u'xterm.js' -copyright = u'2014, SourceLair Limited' +copyright = u'2015, SourceLair Limited' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.27' +version = '0.29' # The full version, including alpha/beta/rc tags. -release = '0.27 Alpha' +release = '0.29 Alpha' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.