Merge branch 'master' of github.com:sourcelair/xterm.js into content-editable

diff --cc Procfile.dev
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c7a89ee1041219a1e7a90f6a377089cda284740e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Procfile.dev
@@@ -1,0 -1,0 +1,1 @@@
++web: ./bin/server

diff --cc bin/server
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b5e9d49a09af8f0ebd45af0647a8a2d84d451960
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
+++ b/bin/server
@@@ -1,0 -1,0 +1,4 @@@
++#! /usr/bin/env sh
++
++# Development server for xterm.js
++browser-sync start --server --port 8000 --files="**" --no-ui --index index.html --directory

diff --cc src/xterm.js
index fd9d03a42aadb043d32e9419d989edb4eae91144,608f88b9b8686978bdc41fe59c2039915249dae3..e3410f20e80533e172a4701b0bdc9ff409ea258e
--- 1/src/xterm.js
--- 2/src/xterm.js
+++ b/src/xterm.js
@@@ -393,8 -399,8 +400,7 @@@
        }
  
        this.showCursor();
 -      this.textarea.focus();
 -      Terminal.focus = this;
 +      this.element.focus();
- 
      };
  
      Terminal.prototype.blur = function() {